From: David Goulet <dgoulet@torproject.org>
Date: Fri, 12 Aug 2022 14:14:32 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5' into maint-0.4.6
X-Git-Tag: tor-0.4.6.12~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b86b593c04a6930f84868dd67a30b88bee9c2b31;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5' into maint-0.4.6
---

b86b593c04a6930f84868dd67a30b88bee9c2b31