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

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

ef2dd1ba967eb457c3ace590e4a00d14cb6cf854