commit 237aed037d37d4e75cdeb759830c38701df62726 Merge: 2d4983dcd a5f5bda46 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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