From: David Goulet <dgoulet@torproject.org>
Date: Wed, 20 Feb 2019 17:06:39 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/700'
X-Git-Tag: tor-0.4.1.1-alpha~212
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7037fe116359a9424cb6a20d88f38c0a422ebd68;p=thirdparty%2Ftor.git

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

7037fe116359a9424cb6a20d88f38c0a422ebd68