commit eac4c374e456af4f216392ec2d3b037d5f57e2f3 Merge: c93ecb818 fcd5c3144 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

src/test/test_config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)