summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-06-15 16:21:40 +0000
committerRoger Dingledine <arma@torproject.org>2007-06-15 16:21:40 +0000
commit07ff5c6785e421595b2d65f682482263da937cf1 (patch)
tree450c1e1fe0da50ff8efb561142d537b68c37a1e2 /src/or/circuitbuild.c
parent2cd293dc8f447d9b96590c92d2ef00458c3996a2 (diff)
downloadtor-07ff5c6785e421595b2d65f682482263da937cf1.tar.gz
tor-07ff5c6785e421595b2d65f682482263da937cf1.zip
bugfix on r10609: don't fail asserts when closing circuits
that were connected to an unkeyed connection. svn:r10611
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3f8515542e..98150fedac 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -424,6 +424,8 @@ circuit_n_conn_done(or_connection_t *or_conn, int status)
if (circ->n_addr != or_conn->_base.addr ||
circ->n_port != or_conn->_base.port)
continue;
+ /* now teach circ the right identity_digest */
+ memcpy(circ->n_conn_id_digest, or_conn->identity_digest, DIGEST_LEN);
} else {
/* We expected a key. See if it's the right one. */
if (memcmp(or_conn->identity_digest,