From: David Goulet <dgoulet@torproject.org>
Date: Tue, 23 Mar 2021 12:19:02 +0000 (-0400)
Subject: Merge branch 'tor-gitlab/mr/342'
X-Git-Tag: tor-0.4.6.2-alpha~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35b601a8b5f3d0da989d93a28b585ee570f680fd;p=thirdparty%2Ftor.git

Merge branch 'tor-gitlab/mr/342'
---

35b601a8b5f3d0da989d93a28b585ee570f680fd