summaryrefslogtreecommitdiff
path: root/src/or/circuitstats.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-16 11:20:12 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-16 11:20:12 -0400
commit2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e (patch)
tree66442f7c5577f359159143dfb8a9179ea78071d9 /src/or/circuitstats.h
parenta7bcab263959887b27500372bc6fa1fa0f8c947b (diff)
downloadtor-2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e.tar.gz
tor-2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e.zip
Fix crash when starting with LearnCircuitBuildTimeout 0.
Before we've set our options, we can neither call get_options() nor networkstatus_get_latest_consensus(). Fixes bug 22252; bugfix on 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a in 0.2.9.3-alpha.
Diffstat (limited to 'src/or/circuitstats.h')
-rw-r--r--src/or/circuitstats.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h
index 72b160983f..38a994ded3 100644
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@ -18,6 +18,9 @@ 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 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);