commit eab0d9242dd83c7525d0e7f9946fd0e71a01a342 Merge: 1c85b609d 861d69001 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 1 14:37:07 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

src/test/test_config.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-)