From: David Goulet <dgoulet@torproject.org>
Date: Tue, 6 Dec 2022 15:00:01 +0000 (-0500)
Subject: Merge branch 'maint-0.4.5' into maint-0.4.7
X-Git-Tag: tor-0.4.7.12~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f48a6082b696f3c4b4d9da835365966def49fdd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5' into maint-0.4.7
---

8f48a6082b696f3c4b4d9da835365966def49fdd