commit 4f26c67d45ff5536130da8bbe2b50e3c7158e4a7 Merge: cb42f93a9 e91bae66d Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 12 08:33:47 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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