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

Merge branch 'maint-0.4.6'

"ours" to avoid version bump.
---

407eb5d7cde6d03667ee4e555be69bf8e8924273