From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Jul 2011 18:40:47 +0000 (-0400)
Subject: Do not cannibalize a circuit with isolation values set.
X-Git-Tag: tor-0.2.3.3-alpha~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5df99cec98c809e919aaca6054cb8b59ff151e41;p=thirdparty%2Ftor.git

Do not cannibalize a circuit with isolation values set.
---

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 0fefe9871e..48c5afc7d0 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;