From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Mar 2021 13:18:06 +0000 (-0400)
Subject: Merge branch 'maint-0.4.4' into maint-0.4.5
X-Git-Tag: tor-0.4.6.1-alpha~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2dd8f1532e0eb8ca6d6cbe9d588468482d14146;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.4' into maint-0.4.5

"ours" to avoid version bump.
---

e2dd8f1532e0eb8ca6d6cbe9d588468482d14146