From: Roger Dingledine <arma@torproject.org>
Date: Mon, 8 Mar 2004 01:19:57 +0000 (+0000)
Subject: bugfix: only set conn->hold_open_until_flushed after marking
X-Git-Tag: debian-version-0.0.1+0.0.2pre25-1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=416993afc1f82e3c9946950e6f5554ebe36d11bc;p=thirdparty%2Ftor.git

bugfix: only set conn->hold_open_until_flushed after marking


svn:r1245
---

diff --git a/src/or/main.c b/src/or/main.c
index 10dc270352..766fcfb6b7 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -305,8 +305,8 @@ static void run_connection_housekeeping(int i, time_t now) {
       log_fn(LOG_INFO,"Expiring connection to %d (%s:%d).",
              i,conn->address, conn->port);
       /* flush anything waiting, e.g. a destroy for a just-expired circ */
-      conn->hold_open_until_flushed = 1;
       connection_mark_for_close(conn,0);
+      conn->hold_open_until_flushed = 1;
     } else {
       /* either a full router, or we've got a circuit. send a padding cell. */
       log_fn(LOG_DEBUG,"Sending keepalive to (%s:%d)",