diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-02-29 15:16:15 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-02-29 15:16:15 -0500 |
commit | 6a0d809f44afa4c20382030191bd69cf0017d03a (patch) | |
tree | 330b683a815a4bb280e1aef6415c5d06e8b421af /src | |
parent | 406bc9527125dccdf68745a07100bd1dc48a9903 (diff) | |
parent | 2755b09c52f78f233ed96aef41d283eb52cc89e8 (diff) | |
download | tor-6a0d809f44afa4c20382030191bd69cf0017d03a.tar tor-6a0d809f44afa4c20382030191bd69cf0017d03a.tar.gz |
Merge remote-tracking branch 'sebastian/bug5231'
Diffstat (limited to 'src')
-rw-r--r-- | src/or/circuitlist.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 49a9b0541..85f529194 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1086,6 +1086,7 @@ 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->desired_path_len == DEFAULT_ROUTE_LEN && !circ->build_state->onehop_tunnel && !circ->isolation_values_set) { if (info) { |