forward-port some fixes

svn:r3631

ChangeLog

@@ -1,7 +1,7 @@
 Changes in version 0.0.9.4 - 2005-02-03
   o Bugfixes on 0.0.9:
     - Fix an assert bug that took down most of our servers: when
-      a server claims to have 500 GB of bandwidthburst, don't
+      a server claims to have 1 GB of bandwidthburst, don't
       freak out.
     - Don't crash as badly if we have spawned the max allowed number
       of dnsworkers, or we're out of file descriptors.

src/or/connection.c

@@ -222,7 +222,7 @@ void connection_about_to_close_connection(connection_t *conn)
 
   if (conn->type == CONN_TYPE_AP || conn->type == CONN_TYPE_EXIT) {
     if (!conn->has_sent_end) {
-      log_fn(LOG_WARN,"Bug: Edge connection hasn't sent end yet?");
+      log_fn(LOG_WARN,"Harmless bug: Edge connection hasn't sent end yet?");
 #ifdef TOR_FRAGILE
       tor_assert(0);
 #endif

src/or/connection_edge.c

@@ -133,7 +133,7 @@ connection_edge_end(connection_t *conn, char reason, crypt_path_t *cpath_layer)
   circuit_t *circ;
 
   if (conn->has_sent_end) {
-    log_fn(LOG_WARN,"Bug: Calling connection_edge_end on an already ended stream?");
+    log_fn(LOG_WARN,"Harmless bug: Calling connection_edge_end (reason %d) on an already ended stream?", reason);
 #ifdef TOR_FRAGILE
     tor_assert(0);
 #endif