commit 903ec20c0b4e3bc5de9fe7925380cbf87c107058 Merge: 64ee7bc 744077d Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 1 09:54:08 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18849 | 4 ++++ src/or/routerlist.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-)