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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.3'

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