commit a754096579afc8527a178f3e0c55bddc2498f6a8 Merge: 7c149297 2c28979a Author: hiro <hiro@torproject.org> Date: Mon Aug 27 12:45:54 2018 +0200 Merge branch 'faq-ipv6-hr' docs/en/faq.wml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)