From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 Nov 2020 13:12:20 +0000 (-0500)
Subject: Merge branch 'maint-0.4.3' into maint-0.4.4
X-Git-Tag: tor-0.4.6.0-alpha-dev~10^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09b4c73fe499c185bcdddb40e949185a51003d40;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3' into maint-0.4.4

"ours" to avoid version bump.
---

09b4c73fe499c185bcdddb40e949185a51003d40