commit 5df99cec98c809e919aaca6054cb8b59ff151e41 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 20 14:40:47 2011 -0400
Do not cannibalize a circuit with isolation values set. --- src/or/circuitlist.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 0fefe98..48c5afc 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;
tor-commits@lists.torproject.org