From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 28 Jan 2021 16:18:30 +0000 (-0500)
Subject: Merge branch 'maint-0.4.3' into maint-0.4.4
X-Git-Tag: tor-0.4.4.7~16^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bcb8afe38e7a79cc3d9bffb3ffdcf772202aba43;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3' into maint-0.4.4

"ours" to avoid version bump.
---

bcb8afe38e7a79cc3d9bffb3ffdcf772202aba43