commit 30003e43180561eb92f4146d3bf2a5f74523cda6 Merge: 2dc9546 6dfc0d5 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 28 18:13:17 2011 -0400

Merge branch 'bug3000-022-part2-squashed' into maint-0.2.2

changes/forget-rend-descs-on-newnym | 12 ++++ src/or/config.c | 4 ++ src/or/main.c | 7 +++ src/or/rendclient.c | 103 +++++++++++++++++++++-------------- src/or/router.c | 8 ++-- 5 files changed, 90 insertions(+), 44 deletions(-)