commit 2db94810bf26d92525048fe998967b91d83db291 Merge: b594455dd 746410fb2 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)