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

[nickm at torproject.org]

commit 6a7aa4735724cdf8d37e4109705338a1ea947449
Merge: 009141c6a 85115796b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:11:10 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 src/test/test_config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)