commit 599d1b62b4c98ad5fea1d0f3f5523c8dc53779e1 Merge: 865d53b 68ae5af Author: Nick Mathewson nickm@torproject.org Date: Tue May 3 17:30:58 2011 -0400

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

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

changes/bug2230_part4 | 6 ++++++ src/or/main.c | 1 + src/or/microdesc.c | 11 ++++++++--- 3 files changed, 15 insertions(+), 3 deletions(-)

diff --cc src/or/main.c index 7a97a21,462b51e..a50a3cd --- a/src/or/main.c +++ b/src/or/main.c @@@ -1267,8 -1073,10 +1267,9 @@@ 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(); - rend_cache_clean_v2_descs_as_dir(); - if (authdir_mode_v3(options)) - microdesc_cache_rebuild(NULL, 0); + 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; } diff --cc src/or/microdesc.c index 5d3f1c3,73d2285..6209bbf --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -245,14 -208,6 +245,12 @@@ microdescs_add_list_to_cache(microdesc_ if (f) finish_writing_to_file(open_file); /*XXX Check me.*/

- microdesc_cache_rebuild(cache, 0/* only as needed */); - + { + networkstatus_t *ns = networkstatus_get_latest_consensus(); + if (ns && ns->flavor == FLAV_MICRODESC) + SMARTLIST_FOREACH(added, microdesc_t *, md, nodelist_add_microdesc(md)); + } + return added; }