From: David Goulet <dgoulet@torproject.org>
Date: Thu, 29 Aug 2019 16:58:25 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1236'
X-Git-Tag: tor-0.4.2.1-alpha~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88a8deb420801085cfdbcb147a748a8138124bd3;p=thirdparty%2Ftor.git

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

88a8deb420801085cfdbcb147a748a8138124bd3