diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-12-21 21:16:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-12-21 21:16:06 -0500 |
| commit | bbc85b18ca9c3e50fedd783e34f4a866a4960922 (patch) | |
| tree | 845771875659dd4d9679f1c7b89bd130820a7e3c | |
| parent | b98c5884fc28c4c2b4871d00bd6eeb78fadab3f3 (diff) | |
| parent | 2c956f0c99beed22ada43ba9458302308af87884 (diff) | |
| download | tor-bbc85b18ca9c3e50fedd783e34f4a866a4960922.tar tor-bbc85b18ca9c3e50fedd783e34f4a866a4960922.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
| -rw-r--r-- | changes/bug10456 | 6 | ||||
| -rw-r--r-- | src/or/circuituse.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug10456 b/changes/bug10456 new file mode 100644 index 000000000..fb3b92fcd --- /dev/null +++ b/changes/bug10456 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Avoid launching spurious extra circuits when a stream is pending. + This fixes a bug where any circuit that _wasn't_ unusable for new + streams would be treated as if it were, causing extra circuits to + be launched. Fixes bug 10456; bugfix on 0.2.4.12-alpha. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index cb9e93191..8b82de0f9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -824,7 +824,7 @@ circuit_stream_is_being_handled(entry_connection_t *conn, cpath_build_state_t *build_state = origin_circ->build_state; if (build_state->is_internal || build_state->onehop_tunnel) continue; - if (!origin_circ->unusable_for_new_conns) + if (origin_circ->unusable_for_new_conns) continue; exitnode = build_state_get_exit_node(build_state); |