From: David Goulet <dgoulet@torproject.org>
Date: Tue, 11 Jun 2019 15:46:38 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1031'
X-Git-Tag: tor-0.4.2.1-alpha~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e112cecd8cf944e095304257563415e60891780;p=thirdparty%2Ftor.git

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

8e112cecd8cf944e095304257563415e60891780