diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-16 11:20:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-16 11:20:12 -0400 |
| commit | 2ba58f275cef6ae70c0d6f5a94f8bd3ff99f1e5e (patch) | |
| tree | 66442f7c5577f359159143dfb8a9179ea78071d9 /src/or/config.c | |
| parent | a7bcab263959887b27500372bc6fa1fa0f8c947b (diff) | |
| download | tor-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/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 3693cdf83c..dd9f4eb19e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3450,7 +3450,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, 1)) { severity = LOG_INFO; } log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but " |