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

[nickm at torproject.org]

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 12 09:44:13 2018 -0400

    Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)