From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Jun 2021 17:32:18 +0000 (-0400)
Subject: Merge branch 'maint-0.4.6'
X-Git-Tag: tor-0.4.7.1-alpha~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ea62b87d033a0395b206c48a6f1c371e18ac27e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.6'

"ours" to avoid version bump.
---

4ea62b87d033a0395b206c48a6f1c371e18ac27e