commit 7e486dd6f7f845c14471b406d6bc7dfa4f593b12 Merge: 953a8f851 0dc55fb24 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:51:54 2017 -0500

Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9

changes/bug23985 | 9 +++++++++ src/or/routerlist.c | 5 +++++ 2 files changed, 14 insertions(+)