[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 17073d7234031c318108300007d2f540c0c6c859
Merge: 2624cd63e b13bf6506
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 3 09:11:03 2017 -0400

    Merge branch 'maint-0.3.1'

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