diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:11:36 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:11:36 -0500 |
| commit | e167a0e17d9211205651b07b65b0e83695bf6cf1 (patch) | |
| tree | ca1e16aeeb810a2c6522553c61e95d86df29c125 /src/or/config.c | |
| parent | 31dd7dec9a9ca6cf6e146fc429ee6be8bcd2042d (diff) | |
| parent | 0069d14753e6050cc20ccd2009b3e04ab8426497 (diff) | |
| download | tor-e167a0e17d9211205651b07b65b0e83695bf6cf1.tar.gz tor-e167a0e17d9211205651b07b65b0e83695bf6cf1.zip | |
Merge remote-tracking branch 'dgoulet/bug21062_030_01'
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 2584fe6dba..f885cbca3b 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 " |