[or-cvs] forward-port some fixes

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs2/tor/src/or

Modified Files:
	connection.c connection_edge.c 
Log Message:
forward-port some fixes


Index: connection.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- connection.c	10 Feb 2005 06:31:34 -0000	1.325
+++ connection.c	17 Feb 2005 01:12:50 -0000	1.326
@@ -222,7 +222,7 @@
 
   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

Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- connection_edge.c	14 Feb 2005 21:16:27 -0000	1.277
+++ connection_edge.c	17 Feb 2005 01:12:50 -0000	1.278
@@ -133,7 +133,7 @@
   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