From 0069d14753e6050cc20ccd2009b3e04ab8426497 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Wed, 18 Jan 2017 12:53:01 -0500 Subject: 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 --- src/or/circuitbuild.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/or/circuitbuild.c') diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 55929c1666..d4e30196cc 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1017,7 +1017,7 @@ circuit_send_next_onion_skin(origin_circuit_t *circ) "Assuming clock jump. Purpose %d (%s)", timediff, circ->base_.purpose, circuit_purpose_to_string(circ->base_.purpose)); - } else if (!circuit_build_times_disabled()) { + } else if (!circuit_build_times_disabled(get_options())) { /* Only count circuit times if the network is live */ if (circuit_build_times_network_check_live( get_circuit_build_times())) { -- cgit v1.2.3-54-g00ecf