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

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

70e249123a8b434406a48046e62b2d3b2ac7fb22