[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 7fcb222ab7c4cbd48ce2481f55110a8e2e0467f9
Merge: c55a05423 7e486dd6f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:51:58 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

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