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