commit 27f017639fa87eb3f235e6d8434f0b7776a38492
Merge: 20fa6a388 93dbce4dd
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Nov 29 20:24:34 2017 -0500
Merge branch 'ticket20020'
changes/ticket20020 | 4 ++++
src/or/routerlist.c | 13 ++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)