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