From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Jul 2020 14:31:16 +0000 (-0400)
Subject: Merge branch 'maint-0.4.3' into maint-0.4.4
X-Git-Tag: tor-0.4.4.2-alpha^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9f4c4ab1d37920eb76b024a1057a0b26ddb8377;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3' into maint-0.4.4

`-s ours` to avoid version bump.
---

f9f4c4ab1d37920eb76b024a1057a0b26ddb8377