[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit 056003d602a2e6f5c2f417d176b68da50b921c32
Merge: df18cf0e8 987e12a58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 08:46:45 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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