From: David Goulet <dgoulet@torproject.org>
Date: Thu, 1 Aug 2019 14:18:10 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1177'
X-Git-Tag: tor-0.4.2.1-alpha~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c4864de5734b623999701da30a42019cabc42e54;p=thirdparty%2Ftor.git

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

c4864de5734b623999701da30a42019cabc42e54