diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-26 13:52:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-26 13:52:16 -0400 |
| commit | 857e210b7d4939cf32d7d519b8b4d739d0b23f43 (patch) | |
| tree | 8faff86c7152c38f9ff582ac08d5ce54bee90e10 /src/or/main.c | |
| parent | 96c5ac338a7df986d2419e14801df42421debd06 (diff) | |
| parent | 8a81a70878bb0f77ebdf1e6fda436b4b6af14f9a (diff) | |
| download | tor-857e210b7d4939cf32d7d519b8b4d739d0b23f43.tar.gz tor-857e210b7d4939cf32d7d519b8b4d739d0b23f43.zip | |
Merge branch 'ticket25931'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c index 18b9b780d1..83d1e6a41a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1742,12 +1742,6 @@ run_scheduled_events(time_t now) /* 11b. check pending unconfigured managed proxies */ if (!net_is_disabled() && pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); - - /* 12. launch diff computations. (This is free if there are none to - * launch.) */ - if (dir_server_mode(options)) { - consdiffmgr_rescan(); - } } /* Periodic callback: rotate the onion keys after the period defined by the |