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