commit 0f4b1020af4a622976273383dbee1b3d3320a449 Merge: 97c988c43 91109bc81 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 12 08:33:47 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23318 | 11 +++++++++++ changes/bug24170 | 3 +++ src/or/routerlist.c | 48 +++++++++++++++++++++++++++++++----------------- 3 files changed, 45 insertions(+), 17 deletions(-)