commit 1e715efb7780c8a697a598ff2c3d03c7daca4340 Merge: 9a9d32fab f0007f2b8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 29 12:06:14 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)