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

[nickm at torproject.org]

commit 85115796bb9095db2b59624b16c005f2252d4d71
Merge: 23e3d57e1 eac4c374e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:11:10 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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