commit 621e95a4f3e1e896ee41e261f5e0c953fb6101a9 Merge: 3968e8d bdff7e3 Author: Nick Mathewson nickm@torproject.org Date: Thu May 12 11:21:59 2011 -0400

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

changes/md_cache_replace | 6 ++++++ src/or/microdesc.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)