diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-04 16:08:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-04 16:08:02 -0400 |
| commit | a60d21a85deacad98fa04d20fb4e83b57ad191d7 (patch) | |
| tree | 91ee0c05f53a29630d85aa2926e54f8b40f03004 | |
| parent | a8e76de4d997690917432d0d60383a1333f80baa (diff) | |
| parent | 3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa (diff) | |
| download | tor-a60d21a85deacad98fa04d20fb4e83b57ad191d7.tar.gz tor-a60d21a85deacad98fa04d20fb4e83b57ad191d7.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/circuitbuild.c
| -rw-r--r-- | changes/bug9671_023 | 5 | ||||
| -rw-r--r-- | src/or/circuituse.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug9671_023 b/changes/bug9671_023 new file mode 100644 index 0000000000..035ca5cdea --- /dev/null +++ b/changes/bug9671_023 @@ -0,0 +1,5 @@ + o Major bugfixes: + - If the circuit build timeout logic is disabled (via the consensus, + or because we are an authority), then don't build testing circuits. + Fixes bug 9657; bugfix on 0.2.2.14-alpha. + diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8fb70f5853..25997ebdbe 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -948,7 +948,7 @@ circuit_predict_and_launch_new(void) * want, don't do another -- we want to leave a few slots open so * we can still build circuits preemptively as needed. */ if (num < MAX_UNUSED_OPEN_CIRCUITS-2 && - get_options()->LearnCircuitBuildTimeout && + ! circuit_build_times_disabled() && circuit_build_times_needs_circuits_now(&circ_times)) { flags = CIRCLAUNCH_NEED_CAPACITY; log_info(LD_CIRC, @@ -1084,7 +1084,7 @@ circuit_expire_old_circuits_clientside(void) tor_gettimeofday(&now); cutoff = now; - if (get_options()->LearnCircuitBuildTimeout && + if (! circuit_build_times_disabled() && circuit_build_times_needs_circuits(&circ_times)) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ |