From: David Goulet <dgoulet@torproject.org>
Date: Thu, 12 Aug 2021 16:13:26 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5' into maint-0.4.6
X-Git-Tag: tor-0.4.6.7~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c3c40e70c654dbae59034a835c0f04b10808e87;p=thirdparty%2Ftor.git

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

4c3c40e70c654dbae59034a835c0f04b10808e87