commit 935cd77f62f036e615923742de278398aa85f2bf Merge: 492f8a7 2ba58f2 Author: Nick Mathewson nickm@torproject.org Date: Thu May 18 10:06:06 2017 -0400

Merge branch 'bug22252_029' into maint-0.3.0

changes/bug22252 | 3 +++ src/or/circuitstats.c | 11 ++++++++++- src/or/circuitstats.h | 3 +++ src/or/config.c | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-)

diff --cc src/or/circuitstats.c index 48cb89d,d4487cf..6e73372 --- a/src/or/circuitstats.c +++ b/src/or/circuitstats.c @@@ -105,8 -105,16 +105,16 @@@ 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; } else { diff --cc src/or/circuitstats.h index 2391027,38a994d..c748f82 --- 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);