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

[nickm at torproject.org]

commit 6252e04a37c8d23e2e6164d20a566fad743a1a37
Merge: baf53300d 911e2dc53
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 28 09:50:26 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug23053 | 5 +++++
 src/or/config.c  | 1 +
 2 files changed, 6 insertions(+)