From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Jun 2021 15:46:20 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.4
X-Git-Tag: tor-0.4.5.10~19^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaint-0.4.4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.4

"ours" to avoid version bump.
---

253b83b72223f67024ea10b4008610dd18396811