commit c8a46cda5b7e254be67b4d117dfc6585de2cbfd7 Merge: c68b4d6da 987e12a58 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 08:46:45 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug27461 | 5 +++++ src/or/main.c | 8 ++++++++ 2 files changed, 13 insertions(+)