[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2
Merge: 42e12a353 8e52c4658
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 08:32:55 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/longclaw-ipv6 | 6 ++++++
 src/or/config.c       | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)