From: David Goulet <dgoulet@torproject.org>
Date: Wed, 8 May 2019 12:02:28 +0000 (-0400)
Subject: Merge branch 'tor-github/pr/1000'
X-Git-Tag: tor-0.4.1.1-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3885e7b44b1df421aa062ba2598f1731e4e3e3a5;p=thirdparty%2Ftor.git

Merge branch 'tor-github/pr/1000'

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

3885e7b44b1df421aa062ba2598f1731e4e3e3a5