diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-11-01 20:27:41 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-11-01 20:27:41 +0000 |
| commit | c534b96e585e33044a55d00e8e5633cb8503dee3 (patch) | |
| tree | 0ac01dc23e1bb65827fa565a63e5d9eb805a6d94 /src/or/circuituse.c | |
| parent | 0c9dfffe5a19da330f3c2b6daa33c40aa786ba06 (diff) | |
| download | tor-c534b96e585e33044a55d00e8e5633cb8503dee3.tar tor-c534b96e585e33044a55d00e8e5633cb8503dee3.tar.gz | |
Fix an assertion failure on double-marked circuits, and a double-mark.
svn:r17179
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8f4788064..14acbf5e6 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, |