diff options
| author | David Goulet <dgoulet@torproject.org> | 2017-01-18 12:53:01 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2017-01-18 12:53:01 -0500 |
| commit | 0069d14753e6050cc20ccd2009b3e04ab8426497 (patch) | |
| tree | 0a09d4fa121e1248ff471f0a41b8ba9a34c13689 /src/or/circuitbuild.c | |
| parent | fa00f2dce5a93164e36860794b75c595067c2f63 (diff) | |
| download | tor-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/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
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())) { |