commit 4e3a17facdf67dc5634f2899a7839b99b515fe63 Merge: 59819b291 f6efb3a18 Author: teor <teor@torproject.org> Date: Thu Apr 9 11:06:51 2020 +1000 Merge branch 'maint-0.4.3' "ours" merge, to avoid taking PR 1854, which reverts "Prefer IPv6 by default" for 0.4.3 only.