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

[nickm at torproject.org]

commit 20fa6a38839ee4882b7fe8d53840ba3087a1b4a6
Merge: 6a9c3d6e3 f0007f2b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 29 12:06:14 2017 -0500

    Merge branch 'maint-0.3.2'

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