commit a877241e6c50cff72503a0179d8e4a9ed6216d57 Merge: 2485f8dea 56857291b Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 31 14:33:46 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25105 | 5 +++++ src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)