From: David Goulet <dgoulet@torproject.org>
Date: Thu, 29 Aug 2019 12:55:27 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1255' into maint-0.4.1
X-Git-Tag: tor-0.4.1.6~17^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=337b733cfc06a30665e34521b72d33c9527eff55;p=thirdparty%2Ftor.git

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

337b733cfc06a30665e34521b72d33c9527eff55