From: teor <teor@torproject.org>
Date: Thu, 9 Apr 2020 01:05:59 +0000 (+1000)
Subject: Merge branch 'pr1854_squashed' into maint-0.4.3
X-Git-Tag: tor-0.4.3.4-rc~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6efb3a184341b5b46c8a565e2ec297d2846e45c;p=thirdparty%2Ftor.git

Merge branch 'pr1854_squashed' into maint-0.4.3

Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).
---

f6efb3a184341b5b46c8a565e2ec297d2846e45c