diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:48:14 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:48:14 -0500 |
| commit | cdbd6d0fe88ed305bff33388439297474b27f352 (patch) | |
| tree | e01b7c688e08d709d40b2dfcb59454812704cf62 /src/or | |
| parent | 029ca804b2bed051185cc21477a713f670106cae (diff) | |
| parent | cc051f9aca96b55533953cfcc10c86f9fe1e7b9a (diff) | |
| download | tor-cdbd6d0fe88ed305bff33388439297474b27f352.tar.gz tor-cdbd6d0fe88ed305bff33388439297474b27f352.zip | |
Merge remote branch 'rransom/bug2190_the_hard_way' into maint-0.2.2
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 9bdbbc17a6..e13215bd2e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -893,6 +893,9 @@ 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(); + /** 1a. Every MIN_ONION_KEY_LIFETIME seconds, rotate the onion keys, * shut down and restart all cpuworkers, and update the directory if * necessary. |