commit 3ccd1c0da7de19e0c61edf0180955b50588b8524 Merge: 6abdc77c3 7e486dd6f Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 11 16:51:58 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)