diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:50:09 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-21 15:50:09 -0500 |
| commit | 0a3b7f1471b608a83edfdf3cdca391aca6f73eb1 (patch) | |
| tree | 5dc61438a7cddd689020f9862bfac137f81f9a99 /src/or | |
| parent | 601b6a8099e6df9b933e9c8290eeef86bc86c84c (diff) | |
| parent | cdbd6d0fe88ed305bff33388439297474b27f352 (diff) | |
| download | tor-0a3b7f1471b608a83edfdf3cdca391aca6f73eb1.tar.gz tor-0a3b7f1471b608a83edfdf3cdca391aca6f73eb1.zip | |
Merge remote branch 'origin/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 08a93133ef..7c6ef19be2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1065,6 +1065,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. |