From: David Goulet <dgoulet@torproject.org>
Date: Thu, 27 Jun 2019 14:19:45 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1129'
X-Git-Tag: tor-0.4.2.1-alpha~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c34a6b922f3e5ff22c99c70bfe3832b647ce5b49;p=thirdparty%2Ftor.git

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

c34a6b922f3e5ff22c99c70bfe3832b647ce5b49