From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Feb 2021 18:39:08 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.3
X-Git-Tag: tor-0.4.4.8~15^2^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaint-0.4.3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.3

"ours" to avoid version bump.
---

8a17999da3626a5f9e8922277151624cd0526fba