From: David Goulet <dgoulet@torproject.org>
Date: Tue, 4 Jun 2019 13:57:03 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1067'
X-Git-Tag: tor-0.4.1.2-alpha~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a63c5f844bcf022f6c83897d111b01344f67b40b;p=thirdparty%2Ftor.git

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

a63c5f844bcf022f6c83897d111b01344f67b40b