diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-12-21 21:15:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-12-21 21:15:39 -0500 |
| commit | 2c956f0c99beed22ada43ba9458302308af87884 (patch) | |
| tree | 24d790ce847fa5d61f532809bd04d1dc28774bd8 | |
| parent | dabdc339fe5abc5949f087621996672c122101b6 (diff) | |
| parent | b5d13d11c90cb94193b6071e8c525f75cc77b861 (diff) | |
| download | tor-2c956f0c99beed22ada43ba9458302308af87884.tar.gz tor-2c956f0c99beed22ada43ba9458302308af87884.zip | |
Merge branch 'bug10456' into 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 0000000000..fb3b92fcd8 --- /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 25997ebdbe..5984691989 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -828,7 +828,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); |