From: David Goulet <dgoulet@torproject.org>
Date: Tue, 11 Jun 2019 15:43:15 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1083'
X-Git-Tag: tor-0.4.2.1-alpha~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9d99d2e15f09a394ad01189b7965af4888a61a6;p=thirdparty%2Ftor.git

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

e9d99d2e15f09a394ad01189b7965af4888a61a6