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

[nickm at torproject.org]

commit 6963aca6ac04205df923b3c3da9d00b8133ad32b
Merge: be3d8cb17 46795a7be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 12 12:31:41 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 src/test/test_config.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)