Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/main.c
	src/or/microdesc.c

1 files changed, 1 insertions, 0 deletions

diff --git a/src/or/main.c b/src/or/main.c
index 7a97a21b2..a50a3cd16 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1269,6 +1269,7 @@ run_scheduled_events(time_t now)
     rep_history_clean(now - options->RephistTrackTime);
     rend_cache_clean(now);
     rend_cache_clean_v2_descs_as_dir(now);
+    microdesc_cache_rebuild(NULL, 0);
 #define CLEAN_CACHES_INTERVAL (30*60)
     time_to_clean_caches = now + CLEAN_CACHES_INTERVAL;
   }