commit af97879446b025c91ec6f27ae463a9e656806a08 Merge: 7e4ac0283 861d69001 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 1 14:37:07 2018 -0400 Merge branch 'maint-0.3.4' src/test/test_config.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)