From: David Goulet <dgoulet@torproject.org>
Date: Tue, 30 Apr 2019 15:50:36 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/980'
X-Git-Tag: tor-0.4.1.1-alpha~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43c119fedbdf599241cd2e3e4292ae5fd55d527c;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/980'

Signed-off-by: David Goulet <dgoulet@torproject.org>
---

43c119fedbdf599241cd2e3e4292ae5fd55d527c