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

[nickm at torproject.org]

commit 861d690018c213ad017fbf8dc99d4790c111c396
Merge: bcce3e7e0 eb604f5fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 1 14:37:07 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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