commit 4d9d2553baa6856b1d85ec26baa1ac3d2c24832a Author: teor teor2345@gmail.com Date: Mon Sep 5 15:12:48 2016 +1000

Fix a typo in the LearnCircuitBuildTimeout disabled log message --- src/or/config.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c index d56d9f6..36b2062 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3468,15 +3468,12 @@ 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 (options->OnionServiceSingleHopMode) { + if (circuit_build_times_disabled()) { severity = LOG_INFO; -#ifdef ENABLE_TOR2WEB_MODE - } else if (options->Tor2webMode) { - severity = LOG_INFO; -#endif } log_fn(severity, LD_CONFIG, "You disabled LearnCircuitBuildTimeout, but " - "didn't a CircuitBuildTimeout. I'll pick a plausible default."); + "didn't specify a CircuitBuildTimeout. I'll pick a plausible " + "default."); }

if (options->PathBiasNoticeRate > 1.0) {