From: teor <teor@torproject.org>
Date: Thu, 9 Apr 2020 01:06:51 +0000 (+1000)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.5.0-alpha-dev~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e3a17facdf67dc5634f2899a7839b99b515fe63;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" merge, to avoid taking PR 1854, which reverts
"Prefer IPv6 by default"  for 0.4.3 only.
---

4e3a17facdf67dc5634f2899a7839b99b515fe63