From: David Goulet <dgoulet@torproject.org>
Date: Thu, 28 Jan 2021 17:00:10 +0000 (-0500)
Subject: Merge branch 'tor-gitlab/mr/186' into maint-0.3.5
X-Git-Tag: tor-0.3.5.13~15^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2cf1365c17822f5e925c4c0bc3bd0367a3a657a8;p=thirdparty%2Ftor.git

Merge branch 'tor-gitlab/mr/186' into maint-0.3.5
---

2cf1365c17822f5e925c4c0bc3bd0367a3a657a8