commit 6c45e79f4fc23078800166b65c544067a6b56835 Merge: 7387258 ddcf531 Author: teor teor@torproject.org Date: Mon Nov 26 15:19:25 2018 +1000

Merge remote-tracking branch 'teor-travel/bug27969'

networks/hs-v23-ipv6 | 2 +- networks/hs-v23-ipv6-md | 2 +- networks/hs-v3-ipv6 | 2 +- networks/hs-v3-ipv6-md | 2 +- torrc_templates/{hs3-only-v6-md.tmpl => hs-v3-only-v6-md.tmpl} | 0 torrc_templates/{hs3-only-v6.tmpl => hs-v3-only-v6.tmpl} | 0 torrc_templates/{hs3-use-v6.tmpl => hs-v3-use-v6.tmpl} | 0 7 files changed, 4 insertions(+), 4 deletions(-)