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

Conflicts:
	src/or/circuituse.c

diff --cc src/or/circuituse.c
index e3c0d0cbd88236495a07ac7d187130e8928c284e,25997ebdbec89aa39fe9b89530cf070d57fcbd2f..00dbc7e239edeb063c9a1ca8d909b520e013b837
--- 1/src/or/circuituse.c
--- 2/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;