aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-06-09 19:56:40 -0700
committerNick Mathewson <nickm@torproject.org>2011-06-17 15:22:23 -0400
commit010b8dd4f6e8e3c3d2e44ff589ff61cbf64b952a (patch)
tree698aaee7acd8e7eb4e13d6544cec554345f85d8e /src
parentbf4b819aae43c11db824f3e790f8a92260e9988e (diff)
downloadtor-010b8dd4f6e8e3c3d2e44ff589ff61cbf64b952a.tar
tor-010b8dd4f6e8e3c3d2e44ff589ff61cbf64b952a.tar.gz
Abandon rendezvous circuits on SIGNAL NEWNYM
Diffstat (limited to 'src')
-rw-r--r--src/or/circuituse.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 41c1899c3..48fc198c4 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -59,7 +59,8 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn,
return 0;
}
- if (purpose == CIRCUIT_PURPOSE_C_GENERAL)
+ if (purpose == CIRCUIT_PURPOSE_C_GENERAL ||
+ purpose == CIRCUIT_PURPOSE_C_REND_JOINED)
if (circ->timestamp_dirty &&
circ->timestamp_dirty+get_options()->MaxCircuitDirtiness <= now)
return 0;