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

[nickm at torproject.org]

commit 654820ec1ca79f5938db81b6d78c452afa1cd9a6
Merge: 346066a42 746410fb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 08:32:55 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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