only expire wedged dir conns that haven't already been expired

svn:r1676

src/or/main.c

@@ -307,6 +307,7 @@ static void run_connection_housekeeping(int i, time_t now) {
   connection_t *conn = connection_array[i];
 
   if(conn->type == CONN_TYPE_DIR &&
+     !conn->marked_for_close &&
      conn->timestamp_lastwritten + 5*60 < now) {
     log_fn(LOG_WARN,"Expiring wedged directory conn (purpose %d)", conn->purpose);
     connection_mark_for_close(conn,0);