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

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

f39dd0a7007d5152542ba5a493d7f25f1792b682