[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit fcd5c3144a44f4081e9e7c4336b932e31ae45f77
Merge: 1db5081ba a5f5bda46
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:11:10 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

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