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

[nickm at torproject.org]

commit 78b827467903905584156ee733b92a62c70b757e
Merge: ee3d83dbf 35574d4a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 08:47:58 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23081 | 8 ++++++++
 src/or/ntmain.c  | 1 +
 2 files changed, 9 insertions(+)