commit 35deb4d442da38d7dcfb235665da50f3a4f7c293 Merge: b0867fe 5138f5c Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 8 10:18:31 2015 -0500

Merge branch 'bug17772_024' into maint-0.2.4

changes/bug17772 | 7 +++++++ src/or/routerlist.c | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)