From: Roger Dingledine <arma@torproject.org>
Date: Sat, 24 Apr 2010 00:26:23 +0000 (-0400)
Subject: Merge branch 'maint-0.2.1'
X-Git-Tag: tor-0.2.2.13-alpha~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7bd97493c3193b06cd552342fad12035db72523;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1'
---

e7bd97493c3193b06cd552342fad12035db72523
diff --cc src/or/main.c
index 017f72baca,9052f7c570..0ddb65a749
--- a/src/or/main.c
+++ b/src/or/main.c
@@@ -730,8 -718,10 +741,11 @@@ run_connection_housekeeping(int i, time
    if (!connection_speaks_cells(conn))
      return; /* we're all done here, the rest is just for OR conns */
  
+   /* If we haven't written to an OR connection for a while, then either nuke
+      the connection or send a keepalive, depending. */
+ 
    or_conn = TO_OR_CONN(conn);
 +  tor_assert(conn->outbuf);
  
    if (or_conn->is_bad_for_new_circs && !or_conn->n_circuits) {
      /* It's bad for new circuits, and has no unmarked circuits on it: