From: David Goulet <dgoulet@torproject.org>
Date: Tue, 29 Jun 2021 14:55:46 +0000 (-0400)
Subject: Merge branch 'tor-gitlab/mr/275'
X-Git-Tag: tor-0.4.7.1-alpha~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9edcea0ca9aaaa208a52149b742d048eaaff142;p=thirdparty%2Ftor.git

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

e9edcea0ca9aaaa208a52149b742d048eaaff142