diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-12 13:59:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-12 13:59:26 -0500 |
| commit | c2e200cef8b910434d8b5d251597081935392377 (patch) | |
| tree | 293dc48e46d39600302c771920a9369b27d723dd /src/or/main.c | |
| parent | b0c32106b3559b4ee9fabfb1a49e2e328c850305 (diff) | |
| parent | 3033ba9f5ec8eb4dea3e6778f6d7546cacf7ae57 (diff) | |
| download | tor-c2e200cef8b910434d8b5d251597081935392377.tar.gz tor-c2e200cef8b910434d8b5d251597081935392377.zip | |
Merge branch 'bug13806_squashed'
Conflicts:
src/or/relay.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index b691a92df2..bc9cde2e0c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1443,7 +1443,7 @@ run_scheduled_events(time_t now) if (time_to_clean_caches < now) { rep_history_clean(now - options->RephistTrackTime); rend_cache_clean(now); - rend_cache_clean_v2_descs_as_dir(now); + rend_cache_clean_v2_descs_as_dir(now, 0); microdesc_cache_rebuild(NULL, 0); #define CLEAN_CACHES_INTERVAL (30*60) time_to_clean_caches = now + CLEAN_CACHES_INTERVAL; |