commit 10e442ba93be0c41daec10319943aa19c616b281 Merge: a03469a 978210d Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 16 08:41:20 2015 -0500 Merge remote-tracking branch 'teor/feature17864' changes/feature17864 | 5 +++++ src/or/routerlist.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-)