From a8417dfac88ae351db38b2f0cf970625937ef5a4 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Thu, 20 May 2004 22:39:01 +0000
Subject: fix a double mark-for-close

svn:r1913
---
 src/or/connection_edge.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/or/connection_edge.c')

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 82e28e409..3cbd54d15 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -317,7 +317,8 @@ void connection_ap_attach_pending(void)
 
   for (i = 0; i < n; ++i) {
     conn = carray[i];
-    if (conn->type != CONN_TYPE_AP ||
+    if (conn->marked_for_close ||
+        conn->type != CONN_TYPE_AP ||
         conn->state != AP_CONN_STATE_CIRCUIT_WAIT)
       continue;
     if(connection_ap_handshake_attach_circuit(conn) < 0) {
-- 
cgit v1.2.3