From: David Goulet <dgoulet@torproject.org>
Date: Wed, 2 Oct 2019 18:15:31 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1385'
X-Git-Tag: tor-0.4.2.2-alpha~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca1f18c159fe2c46b32daf86334689afe2db4f94;p=thirdparty%2Ftor.git

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

ca1f18c159fe2c46b32daf86334689afe2db4f94