From: David Goulet <dgoulet@torproject.org>
Date: Wed, 11 Sep 2019 13:36:28 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1311'
X-Git-Tag: tor-0.4.2.1-alpha~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=049705fc1c9d1c0cee120dc8cbd1a719c6e45e85;p=thirdparty%2Ftor.git

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

049705fc1c9d1c0cee120dc8cbd1a719c6e45e85