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