Merge branch 'bug22252_029' into maint-0.3.0

diff --cc src/or/circuitstats.c
index 48cb89dc37f114b64be445d881f82034e3ea22dd,d4487cfcb7d4382c3fa92520388e7f4c23875821..6e7337255071a9c21bb8a3bdb4e875ba4d168d3a
--- 1/src/or/circuitstats.c
--- 2/src/or/circuitstats.c
+++ b/src/or/circuitstats.c
@@@ -105,7 -105,15 +105,15 @@@ get_circuit_build_timeout_ms(void
   *  6. If we are configured in Single Onion mode
   */
  int
 -circuit_build_times_disabled(void)
 +circuit_build_times_disabled(const or_options_t *options)
+ {
 -  return circuit_build_times_disabled_(get_options());
++  return circuit_build_times_disabled_(options, 0);
+ }
+ 
+ /** As circuit_build_times_disabled, but take options as an argument. */
+ int
+ circuit_build_times_disabled_(const or_options_t *options,
+                               int ignore_consensus)
  {
    if (unit_tests) {
      return 0;

diff --cc src/or/circuitstats.h
index 23910276ae1104bd19cc79e8dcf464a605d229a4,38a994ded34afe6bea907cc212118acaae58ba8e..c748f82d5ec75b1a55878814e197491b63c0b39e
--- 1/src/or/circuitstats.h
--- 2/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@@ -17,7 -17,10 +17,10 @@@ circuit_build_times_t *get_circuit_buil
  double get_circuit_build_close_time_ms(void);
  double get_circuit_build_timeout_ms(void);
  
 -int circuit_build_times_disabled(void);
 +int circuit_build_times_disabled(const or_options_t *options);
+ int circuit_build_times_disabled_(const or_options_t *options,
+                                   int ignore_consensus);
+ 
  int circuit_build_times_enough_to_compute(const circuit_build_times_t *cbt);
  void circuit_build_times_update_state(const circuit_build_times_t *cbt,
                                        or_state_t *state);

diff --cc src/or/config.c
Simple merge