From: David Goulet <dgoulet@torproject.org>
Date: Thu, 30 May 2019 13:59:21 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1054'
X-Git-Tag: tor-0.4.1.2-alpha~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef9170db4cc936c7154d8be7626f9c57f75c0049;p=thirdparty%2Ftor.git

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

ef9170db4cc936c7154d8be7626f9c57f75c0049