From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 May 2017 14:06:06 +0000 (-0400)
Subject: Merge branch 'bug22252_029' into maint-0.3.0
X-Git-Tag: tor-0.3.0.8~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=935cd77f62f036e615923742de278398aa85f2bf;p=thirdparty%2Ftor.git

Merge branch 'bug22252_029' into maint-0.3.0
---

935cd77f62f036e615923742de278398aa85f2bf
diff --cc src/or/circuitstats.c
index 48cb89dc37,d4487cfcb7..6e73372550
--- a/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 23910276ae,38a994ded3..c748f82d5e
--- a/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);