Commit d5e9573e authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge remote-tracking branch 'origin/maint-0.2.4' 

Conflicts:
	src/or/circuituse.c
parents 386e9fb2 a60d21a8

changes/bug9671_023

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  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.

src/or/circuituse.c

+2 −2
Original line number Diff line number Diff line
@@ -943,7 +943,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(get_circuit_build_times())) {

    flags = CIRCLAUNCH_NEED_CAPACITY;

    log_info(LD_CIRC,
@@ -1079,7 +1079,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(get_circuit_build_times())) {

    /* Circuits should be shorter lived if we need more of them

     * for learning a good build timeout */