From cbb4803ec8093386a9a13b8d1a124c0080e64c06 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 17 Feb 2005 01:12:50 +0000 Subject: forward-port some fixes svn:r3631 --- ChangeLog | 2 +- src/or/connection.c | 2 +- src/or/connection_edge.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80c09a3d9b..6424fad83c 100644 --- a/ChangeLog +++ b/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. diff --git a/src/or/connection.c b/src/or/connection.c index 6fd80c8745..f23bfe64a8 100644 --- a/src/or/connection.c +++ b/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 diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index b45f75b175..a541ab1c44 100644 --- a/src/or/connection_edge.c +++ b/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 -- cgit v1.2.3-54-g00ecf