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

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

4587e67dfd29f62ced4c52c18d2c2b7e1538080b