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

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

a462ca7cce3699f488b5e2f2921738c944cb29c7