commit 2c98104c7410e859e68a8e9e7b82f9af7595c921 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 20 20:27:36 2011 -0400

Add another precondition for isolation-clearing; fix 3620 --- src/or/circuituse.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/or/circuituse.c b/src/or/circuituse.c index acfdc23..c480201 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1041,8 +1041,15 @@ circuit_has_opened(origin_circuit_t *circ) * controller did it. Just let it slide. */ }

- if (can_try_clearing_isolation && !tried_clearing_isolation && + if (/* The circuit may have become non-open if it was cannibalized.*/ + circ->_base.state == CIRCUIT_STATE_OPEN && + /* Only if the purpose is clearable, and only if we haven't tried + * to clear isolation yet, do we try. */ + can_try_clearing_isolation && !tried_clearing_isolation && + /* If !isolation_values_set, there is nothing to clear. */ circ->isolation_values_set && + /* It's not legal to clear a circuit's isolation info if it's ever had + * streams attached */ !circ->isolation_any_streams_attached) { /* If we have any isolation information set on this circuit, and * we didn't manage to attach any streams to it, then we can