summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-10-02 13:40:26 +0200
committerNick Mathewson <nickm@torproject.org>2015-10-02 13:40:26 +0200
commit0b3190d4b73be07dd78c3c0bca8b30651915fc37 (patch)
treed6ffd0ab6df8898fdd365d8d991f02f183c72fd5 /src/or/main.c
parent0e03a0421ee83892b1612f74f95c01c15b4aef19 (diff)
parent08b1738a18e9e323109e7e0f0a23158bbd45a5c1 (diff)
downloadtor-0b3190d4b73be07dd78c3c0bca8b30651915fc37.tar.gz
tor-0b3190d4b73be07dd78c3c0bca8b30651915fc37.zip
Merge remote-tracking branch 'donncha/feature14846_4'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 693d13cd13..8f4c239567 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1518,7 +1518,8 @@ run_scheduled_events(time_t now)
/* Remove old information from rephist and the rend cache. */
if (time_to.clean_caches < now) {
rep_history_clean(now - options->RephistTrackTime);
- rend_cache_clean(now);
+ rend_cache_clean(now, REND_CACHE_TYPE_CLIENT);
+ rend_cache_clean(now, REND_CACHE_TYPE_SERVICE);
rend_cache_clean_v2_descs_as_dir(now, 0);
microdesc_cache_rebuild(NULL, 0);
#define CLEAN_CACHES_INTERVAL (30*60)