From: David Goulet <dgoulet@torproject.org>
Date: Tue, 23 Jul 2019 13:43:36 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1153'
X-Git-Tag: tor-0.4.2.1-alpha~132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2fce1274de5bcfd053d6b4b4b5858f6061eb2989;p=thirdparty%2Ftor.git

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

2fce1274de5bcfd053d6b4b4b5858f6061eb2989