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

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

b47adcbcabf8b07ffb19b0cfeb02996b07104ccf