From: David Goulet <dgoulet@torproject.org>
Date: Thu, 8 Aug 2019 16:26:59 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1172'
X-Git-Tag: tor-0.4.2.1-alpha~99
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0312da75a33c6f545f32ca682afa0dfaf9e31598;p=thirdparty%2Ftor.git

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

0312da75a33c6f545f32ca682afa0dfaf9e31598