commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 31 14:33:12 2018 -0500

Merge branch 'bug25105_032' into maint-0.3.2

changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)