From: David Goulet <dgoulet@torproject.org>
Date: Mon, 24 Jan 2022 15:49:41 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5' into release-0.3.5
X-Git-Tag: tor-0.3.5.18^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.3.5;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into release-0.3.5
---

1628af235e5fe06536ad6ec32bf87f2225c82d32