commit 47f472510fab2bc2c06e53ee932b13cfe1bdcbe4 Merge: 6a726d3 bb6d45a Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 26 12:49:58 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/rephist.c changes/bug2899 | 4 ++++ src/or/rephist.c | 42 ++++++++++++++++++++++-------------------- src/or/routerlist.c | 4 ++-- 3 files changed, 28 insertions(+), 22 deletions(-)