sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'bug10456' into maint-0.2.4

This commit is contained in:
Nick Mathewson 2013-12-21 21:15:39 -05:00
parent dabdc339fe b5d13d11c9
commit 2c956f0c99
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug10456 Normal file
View File

@ -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.

2
src/or/circuituse.c
View File

@ -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);