From: David Goulet <dgoulet@torproject.org>
Date: Thu, 21 Jan 2021 19:58:31 +0000 (-0500)
Subject: Merge branch 'tor-gitlab/mr/270' into maint-0.4.5
X-Git-Tag: tor-0.4.5.4-rc~6^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c54f4b81da5635b282fc45c6301c490663113434;p=thirdparty%2Ftor.git

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

c54f4b81da5635b282fc45c6301c490663113434