diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-03 11:59:31 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-03 11:59:31 -0400 |
| commit | ed636de4cc71fb2936358da27f211fb6a255cd9d (patch) | |
| tree | a67eddd76c29cd20ad73540c62bbdfcd24be87a5 /src/or/main.c | |
| parent | be9f0e5f20e37d2176ce0663b71b532c44c10c28 (diff) | |
| parent | 77b7eb2795208ad5c5f66a5626a89b14b03de6f2 (diff) | |
| download | tor-ed636de4cc71fb2936358da27f211fb6a255cd9d.tar.gz tor-ed636de4cc71fb2936358da27f211fb6a255cd9d.zip | |
Merge remote-tracking branch 'github/ticket25951'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index b492166f87..02be5e054e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1711,9 +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(); - /* Maybe enough time elapsed for us to reconsider a circuit. */ circuit_upgrade_circuits_from_guard_wait(); |