commit 3beb3dac2db492df1686abd1d2c047d5ee6cddcc Merge: f755f9b9e c80293706 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 6 09:49:06 2017 -0500

Merge branch 'maint-0.3.2'

changes/bug23318 | 7 +++++++ src/or/routerlist.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)