From: David Goulet <dgoulet@torproject.org>
Date: Wed, 24 Feb 2021 18:55:21 +0000 (-0500)
Subject: Merge branch 'tor-gitlab/mr/321' into maint-0.4.5
X-Git-Tag: tor-0.4.5.7~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6ea7eb58c697d9e02090f63687803e921bc7c13f;p=thirdparty%2Ftor.git

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

6ea7eb58c697d9e02090f63687803e921bc7c13f