From: David Goulet <dgoulet@torproject.org>
Date: Wed, 24 Apr 2019 13:51:14 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/943'
X-Git-Tag: tor-0.4.1.1-alpha~61
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=608cf2ba8d48f99d0d17ee528ec55080dbd8154c;p=thirdparty%2Ftor.git

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

608cf2ba8d48f99d0d17ee528ec55080dbd8154c