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

commit 8e451c5c7c22ed2f48d2378aecfbbc9ae851090a Merge: e084fa419 b13bf6506 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23081 | 8 ++++++++ src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)