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

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

e13e2012b9d1bbde73bea22d9fd13fb0b88c04de