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/config.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/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index c4e9ca2403..c5ce728e60 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3545,7 +3545,7 @@ options_validate(or_options_t *old_options, or_options_t *options, int severity = LOG_NOTICE; /* Be a little quieter if we've deliberately disabled * LearnCircuitBuildTimeout. */ - if (circuit_build_times_disabled()) { + if (circuit_build_times_disabled(options)) { severity = LOG_INFO; } log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but " |