commit 1adc2bf66fedb1768c5013dcf5f4778fae453217 Merge: b53ff86 c3d11b1 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 8 10:20:21 2015 -0500

Merge branch 'maint-0.2.5' into maint-0.2.6

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