From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Jun 2021 15:48:46 +0000 (-0400)
Subject: Merge branch 'maint-0.4.6'
X-Git-Tag: tor-0.4.7.1-alpha~69
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=806bc2442d5102bb9b6f5eb92521e20f09c436b9;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.6'

"ours" to avoid version bump.
---

806bc2442d5102bb9b6f5eb92521e20f09c436b9