From: David Goulet <dgoulet@torproject.org>
Date: Tue, 19 May 2020 19:18:17 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1886'
X-Git-Tag: tor-0.4.5.0-alpha-dev~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1886'
---

ca13249dcc3e9974c35d6c29a2622a5c8d4cf32e