From: David Goulet <dgoulet@torproject.org>
Date: Wed, 4 Sep 2019 12:34:26 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1288'
X-Git-Tag: tor-0.4.2.1-alpha~45
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5fa283a0407437f9d4ef12cd8086da71f04a144;p=thirdparty%2Ftor.git

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

f5fa283a0407437f9d4ef12cd8086da71f04a144