From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 May 2021 13:39:45 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5' into maint-0.4.6
X-Git-Tag: tor-0.4.6.3-rc~6^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3483d6aab5fc8c4c090ffce8cc88586b650ed57b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5' into maint-0.4.6

"ours" to avoid version bump.
---

3483d6aab5fc8c4c090ffce8cc88586b650ed57b