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

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

61bd8f428b2bd637591dace2d7d65af42740b898