commit d5e9573ed24df7c0eb795617de9db2a0c3e40b4d Merge: 386e9fb a60d21a Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 4 16:11:20 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' Conflicts: src/or/circuituse.c changes/bug9671_023 | 5 +++++ src/or/circuituse.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --cc src/or/circuituse.c index e3c0d0c,25997eb..00dbc7e --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -943,8 -948,8 +943,8 @@@ 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)) { + circuit_build_times_needs_circuits_now(get_circuit_build_times())) { flags = CIRCLAUNCH_NEED_CAPACITY; log_info(LD_CIRC, "Have %d clean circs need another buildtime test circ.", num); @@@ -1079,8 -1084,8 +1079,8 @@@ circuit_expire_old_circuits_clientside( tor_gettimeofday(&now); cutoff = now; - if (get_options()->LearnCircuitBuildTimeout && + if (! circuit_build_times_disabled() && - circuit_build_times_needs_circuits(&circ_times)) { + circuit_build_times_needs_circuits(get_circuit_build_times())) { /* Circuits should be shorter lived if we need more of them * for learning a good build timeout */ cutoff.tv_sec -= IDLE_TIMEOUT_WHILE_LEARNING;