fix a double mark-for-close

svn:r1913

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 82e28e40911be307d9bc89aa8b5c53e3db01321c..3cbd54d154724681d142dc3ccbc617a703324a74 100644 (file)
--- 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) {