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

[nickm at torproject.org]

commit 9afa6619244c214d4e192f5e67dcc961c7d69107
Merge: cf92667b9 a5b8b55c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 10:23:52 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24345       | 3 +++
 src/test/test_config.c | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)