From c534b96e585e33044a55d00e8e5633cb8503dee3 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 1 Nov 2008 20:27:41 +0000
Subject: Fix an assertion failure on double-marked circuits, and a
 double-mark.

svn:r17179
---
 src/or/circuituse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 8f4788064d..14acbf5e6c 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1495,7 +1495,7 @@ connection_ap_handshake_attach_circuit(edge_connection_t *conn)
       /* abort parallel intro circs, if any */
       for (c = global_circuitlist; c; c = c->next) {
         if (c->purpose == CIRCUIT_PURPOSE_C_INTRODUCING &&
-            CIRCUIT_IS_ORIGIN(c)) {
+            !c->marked_for_close && CIRCUIT_IS_ORIGIN(c)) {
           origin_circuit_t *oc = TO_ORIGIN_CIRCUIT(c);
           if (oc->rend_data &&
               !rend_cmp_service_ids(conn->rend_data->onion_address,
-- 
cgit v1.2.3-54-g00ecf