From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 15 Apr 2021 16:42:33 +0000 (-0400)
Subject: Merge branch 'maint-0.4.6'
X-Git-Tag: tor-0.4.7.0-alpha-dev~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f78243fc3afdc571d921a091a40e405e6b963be;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.6'

"ours" to avoid version bump.
---

8f78243fc3afdc571d921a091a40e405e6b963be