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

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

8dfc8d7063bf4b317bd47b7a2e8cccb0a428e861