commit ed636de4cc71fb2936358da27f211fb6a255cd9d Merge: be9f0e5f2 77b7eb279 Author: Nick Mathewson nickm@torproject.org Date: Thu May 3 11:59:31 2018 -0400
Merge remote-tracking branch 'github/ticket25951'
changes/ticket25951 | 9 +++++++++ src/common/log.c | 25 +++++++++++++++++++++++++ src/common/torlog.h | 2 ++ src/or/config.c | 1 + src/or/control.c | 22 +++++++++++++++++++++- src/or/control.h | 1 + src/or/main.c | 3 --- 7 files changed, 59 insertions(+), 4 deletions(-)
diff --cc src/or/main.c index b492166f8,e68f72d1e..02be5e054 --- a/src/or/main.c +++ b/src/or/main.c @@@ -1711,9 -1693,14 +1711,6 @@@ run_scheduled_events(time_t now */ consider_hibernation(now);
- /* 0c. If we've deferred log messages for the controller, handle them now */ - flush_pending_log_callbacks(); - /* 0b. If we've deferred a signewnym, make sure it gets handled - * eventually. */ - if (signewnym_is_pending && - time_of_last_signewnym + MAX_SIGNEWNYM_RATE <= now) { - log_info(LD_CONTROL, "Honoring delayed NEWNYM request"); - signewnym_impl(now); - } -- /* Maybe enough time elapsed for us to reconsider a circuit. */ circuit_upgrade_circuits_from_guard_wait();