summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-05-01 10:38:46 -0400
committerNick Mathewson <nickm@torproject.org>2018-05-01 10:38:46 -0400
commit77b7eb2795208ad5c5f66a5626a89b14b03de6f2 (patch)
treec057238cb672ce08abfbc4b20a452087554bde6f /src/or/main.c
parent0d8604c76306ea95e7918af67cf268d630aea941 (diff)
downloadtor-77b7eb2795208ad5c5f66a5626a89b14b03de6f2.tar.gz
tor-77b7eb2795208ad5c5f66a5626a89b14b03de6f2.zip
Remove responsibility for flushing log cbs from mainloop
This is now handled as-needed as the control module is flushing its own callbacks. Closes ticket 25951.
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index f1b8308304..e68f72d1e8 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1701,9 +1701,6 @@ run_scheduled_events(time_t now)
signewnym_impl(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();