commit 5f78775a8a1d1155fc14231c5a416ab23d3a02ab Merge: 11abdccc7 85115796b Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 09:11:10 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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