commit b9bce4288e357b42c38c88273237f1f8a7440356 Merge: fcdec0068 a5b8b55c1 Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 18 10:23:52 2017 -0500

Merge branch 'maint-0.3.2'

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