Merge branch 'maint-0.2.1'

diff --cc src/or/main.c
index 017f72bacad2b55836ed25ebddb6e7a0c74c4885,9052f7c570b7f0dc6e7b98f47ab7a3145f8a4637..0ddb65a749f825c7547b3fb738f019d0ad3ff6aa
--- 1/src/or/main.c
--- 2/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: