commit 49e8352f1666611fee754d06a39b16f83b453b62 Merge: d99c6b725 6a7aa4735 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 09:11:10 2017 -0400 Merge branch 'maint-0.3.2' src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)