commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee Merge: 594cf9249 f3af74ccf Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 24 19:35:32 2017 -0400 Merge branch 'feature18329_029_squashed' into maint-0.3.2 changes/feature18329 | 2 +- src/test/test_config.c | 18 +++++++++++++----- src/test/test_router.c | 7 +++++-- 3 files changed, 19 insertions(+), 8 deletions(-)