From: David Goulet <dgoulet@torproject.org>
Date: Fri, 1 Mar 2019 14:36:23 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/718'
X-Git-Tag: tor-0.4.1.1-alpha~182
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13e93bdfd5a3bc8349723a0e3a9e05f2dd300f99;p=thirdparty%2Ftor.git

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

13e93bdfd5a3bc8349723a0e3a9e05f2dd300f99