From: David Goulet <dgoulet@torproject.org>
Date: Tue, 1 Jun 2021 12:47:56 +0000 (-0400)
Subject: Merge branch 'tor-gitlab/mr/393' into maint-0.4.6
X-Git-Tag: tor-0.4.6.5~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83009f80036176ebad5af3f887ff6d12329cd1c5;p=thirdparty%2Ftor.git

Merge branch 'tor-gitlab/mr/393' into maint-0.4.6
---

83009f80036176ebad5af3f887ff6d12329cd1c5