From: David Goulet <dgoulet@torproject.org>
Date: Wed, 4 Sep 2019 12:33:10 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1271' into maint-0.4.1
X-Git-Tag: tor-0.4.1.6~14^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=630bb113a0825b4d4ef8a9447b4ff2557a571a1e;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1271' into maint-0.4.1
---

630bb113a0825b4d4ef8a9447b4ff2557a571a1e