summaryrefslogtreecommitdiff
path: root/src/or/circuitstats.h
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-01-18 12:53:01 -0500
committerDavid Goulet <dgoulet@torproject.org>2017-01-18 12:53:01 -0500
commit0069d14753e6050cc20ccd2009b3e04ab8426497 (patch)
tree0a09d4fa121e1248ff471f0a41b8ba9a34c13689 /src/or/circuitstats.h
parentfa00f2dce5a93164e36860794b75c595067c2f63 (diff)
downloadtor-0069d14753e6050cc20ccd2009b3e04ab8426497.tar.gz
tor-0069d14753e6050cc20ccd2009b3e04ab8426497.zip
circuit: Make circuit_build_times_disabled take an or_options_t
That way, when we are parsing the options and LearnCircuitBuildTimeout is set to 0, we don't assert trying to get the options list with get_options(). Fixes #21062 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/circuitstats.h')
-rw-r--r--src/or/circuitstats.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitstats.h b/src/or/circuitstats.h
index 72b160983f..23910276ae 100644
--- a/src/or/circuitstats.h
+++ b/src/or/circuitstats.h
@@ -17,7 +17,7 @@ circuit_build_times_t *get_circuit_build_times_mutable(void);
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_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);