commit 30a681553f2ecc7747236085dd3331e9875651d5 Merge: fa78546db a62f59f00 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 27 11:13:05 2017 -0400
Merge remote-tracking branch 'public/exit_carefully'
changes/bug23848 | 8 +++ src/common/compat_libevent.h | 1 + src/or/config.c | 67 +++++++++++++++++------- src/or/connection_edge.c | 2 +- src/or/control.c | 3 +- src/or/hibernate.c | 7 ++- src/or/main.c | 119 ++++++++++++++++++++++++++++++++++++------- src/or/main.h | 4 +- src/or/ntmain.c | 2 +- src/test/test_keygen.sh | 109 +++++++++++++++++++++++++++++++++++++++ 10 files changed, 278 insertions(+), 44 deletions(-)
diff --cc src/or/config.c index 63a1cac99,64e42c93c..82c35e952 --- a/src/or/config.c +++ b/src/or/config.c @@@ -1684,13 -1667,11 +1687,16 @@@ options_act(const or_options_t *old_opt return -1; }
+ if (options->ProtocolWarnings) + protocol_warning_severity_level = LOG_WARN; + else + protocol_warning_severity_level = LOG_INFO; + - if (consider_adding_dir_servers(options, old_options) < 0) + if (consider_adding_dir_servers(options, old_options) < 0) { + // XXXX This should get validated earlier, and committed here, to + // XXXX lower opportunities for reaching an error case. return -1; + }
if (rend_non_anonymous_mode_enabled(options)) { log_warn(LD_GENERAL, "This copy of Tor was compiled or configured to run "