diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:12:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:12:16 -0400 |
| commit | 91c6bc160b1d2be60e5756f13d28ba469049351c (patch) | |
| tree | 9bd25229bde6e1f7960665c130fa650d3e167a4b /src/or/main.c | |
| parent | b5c5086aba2fa24649fcbda7db80ef599d56e3c6 (diff) | |
| parent | dc0264f6593116da413dc5ca6c424dcff36fbbd2 (diff) | |
| download | tor-91c6bc160b1d2be60e5756f13d28ba469049351c.tar.gz tor-91c6bc160b1d2be60e5756f13d28ba469049351c.zip | |
Merge remote-tracking branch 'dgoulet/ticket17242_032_03-squashed'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index a204a707dd..38ebe3f257 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1827,8 +1827,8 @@ clean_caches_callback(time_t now, const or_options_t *options) { /* Remove old information from rephist and the rend cache. */ rep_history_clean(now - options->RephistTrackTime); - rend_cache_clean(now, REND_CACHE_TYPE_CLIENT); rend_cache_clean(now, REND_CACHE_TYPE_SERVICE); + hs_cache_clean_as_client(now); hs_cache_clean_as_dir(now); microdesc_cache_rebuild(NULL, 0); #define CLEAN_CACHES_INTERVAL (30*60) @@ -1847,6 +1847,7 @@ rend_cache_failure_clean_callback(time_t now, const or_options_t *options) * clean it as soon as we can since we want to make sure the client waits * as little as possible for reachability reasons. */ rend_cache_failure_clean(now); + hs_cache_client_intro_state_clean(now); return 30; } |