From: David Goulet <dgoulet@torproject.org>
Date: Tue, 8 Oct 2019 18:49:39 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1381'
X-Git-Tag: tor-0.4.3.0-alpha-dev~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f60337da4bc1b813489482d9001285e9b104d3d;p=thirdparty%2Ftor.git

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

1f60337da4bc1b813489482d9001285e9b104d3d