From: David Goulet <dgoulet@torproject.org>
Date: Fri, 12 Feb 2021 18:13:50 +0000 (-0500)
Subject: Merge branch 'tor-gitlab/mr/304' into maint-0.4.5
X-Git-Tag: tor-0.4.5.6~8^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5887c1f1f3f2c73e0750f0bf98431cba74e300bc;p=thirdparty%2Ftor.git

Merge branch 'tor-gitlab/mr/304' into maint-0.4.5
---

5887c1f1f3f2c73e0750f0bf98431cba74e300bc