commit a574f7f3fe7b4f7300c1ced5f67d8e014e04ffbd Merge: 31f253a ec8a06c Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 9 13:54:04 2012 -0500

Merge branch 'bug5343' into maint-0.2.2

changes/bug5343 | 7 +++++++ src/or/routerlist.c | 29 ++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 5 deletions(-)