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

[nickm at torproject.org]

commit 4902cccab4339e2e69cde360207965bc3c5f5e7a
Merge: 51bc8283a eb604f5fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 1 14:37:07 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_config.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)