From: David Goulet <dgoulet@torproject.org>
Date: Mon, 29 Jul 2019 16:02:47 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1179' into maint-0.4.1
X-Git-Tag: tor-0.4.1.5~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d6054f75065214c55d17796cf1587692fbb5cea;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1179' into maint-0.4.1
---

1d6054f75065214c55d17796cf1587692fbb5cea