commit 91109bc813211516e34f25fc4418211488a8ab57 Merge: b2c4d4e7f e91bae66d Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 12 08:33:47 2018 -0500

Merge branch 'maint-0.2.9' into maint-0.3.1

changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)