[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit a8f4f5742e89c084b96a24bd8e1add0025479f54
Merge: 4a3b61a5b 654820ec1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 08:32:55 2017 -0400

    Merge branch 'maint-0.3.1'

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