From: David Goulet <dgoulet@torproject.org>
Date: Wed, 6 Oct 2021 19:41:17 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5' into maint-0.4.6
X-Git-Tag: tor-0.4.6.8~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a160a9ec30e11fe99ec60a072416b8bf74d39018;p=thirdparty%2Ftor.git

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

a160a9ec30e11fe99ec60a072416b8bf74d39018