From: David Goulet <dgoulet@torproject.org>
Date: Wed, 14 Apr 2021 12:39:17 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5'
X-Git-Tag: tor-0.4.6.2-alpha~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91569c4dad91029a70b0d8e89c1fb901a371b012;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5'
---

91569c4dad91029a70b0d8e89c1fb901a371b012