diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-02-17 01:12:50 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-02-17 01:12:50 +0000 |
| commit | cbb4803ec8093386a9a13b8d1a124c0080e64c06 (patch) | |
| tree | d2b60a25bb2d4b9e2a278336053141673ecbf66f /src | |
| parent | d418cd5f70323048151a1516ba444c40c60907dc (diff) | |
| download | tor-cbb4803ec8093386a9a13b8d1a124c0080e64c06.tar.gz tor-cbb4803ec8093386a9a13b8d1a124c0080e64c06.zip | |
forward-port some fixes
svn:r3631
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection.c | 2 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 |