aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-20 14:40:47 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-20 14:40:47 -0400
commit5df99cec98c809e919aaca6054cb8b59ff151e41 (patch)
tree991fc066bed0a7ca461a9991156f49787749e346 /src
parentcd3709a2b093122b8d80f21690edeb0dc69837ff (diff)
downloadtor-5df99cec98c809e919aaca6054cb8b59ff151e41.tar
tor-5df99cec98c809e919aaca6054cb8b59ff151e41.tar.gz
Do not cannibalize a circuit with isolation values set.
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitlist.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 0fefe9871..48c5afc7d 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1005,7 +1005,8 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info,
(!need_capacity || circ->build_state->need_capacity) &&
(internal == circ->build_state->is_internal) &&
circ->remaining_relay_early_cells &&
- !circ->build_state->onehop_tunnel) {
+ !circ->build_state->onehop_tunnel &&
+ !circ->isolation_values_set) {
if (info) {
/* need to make sure we don't duplicate hops */
crypt_path_t *hop = circ->cpath;