From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 May 2021 16:21:15 +0000 (-0400)
Subject: Merge branch 'maint-0.4.6'
X-Git-Tag: tor-0.4.7.1-alpha~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6329e9afa97b578a131e62b7ae83c43feafb2b3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.6'

"ours" to avoid version bump.
---

b6329e9afa97b578a131e62b7ae83c43feafb2b3