From: David Goulet <dgoulet@torproject.org>
Date: Tue, 28 May 2019 18:59:07 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1047'
X-Git-Tag: tor-0.4.1.2-alpha~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff9aa32143849c69097000290b939f14c9bbcb36;p=thirdparty%2Ftor.git

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

ff9aa32143849c69097000290b939f14c9bbcb36