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