commit 79f9e63ebf2bbe855af381cb49d5fbeb47ec0880 Merge: e31980f e71dfb6 Author: Nick Mathewson <nickm@torproject.org> Date: Wed May 11 12:30:18 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18816 | 6 ++++++ src/or/routerlist.c | 35 +++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-)