[or-cvs] r9357: (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-01-15 16:21:21 -0500 (Mon, 15 Jan 2007)
New Revision: 9357

Modified:
   tor/trunk/
   tor/trunk/src/or/connection_or.c
   tor/trunk/src/or/control.c
Log:



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11969] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/connection_or.c
===================================================================
--- tor/trunk/src/or/connection_or.c	2007-01-15 21:21:14 UTC (rev 9356)
+++ tor/trunk/src/or/connection_or.c	2007-01-15 21:21:21 UTC (rev 9357)
@@ -826,4 +826,3 @@
   return cnt;
 }
 
-

Modified: tor/trunk/src/or/control.c
===================================================================