commit 8c9b5bfb8c0d933fb76e41bb2f6790bd6185b8ff Merge: 6bc1632b7 c80293706 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 6 09:49:06 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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