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