From: David Goulet <dgoulet@torproject.org>
Date: Tue, 13 Nov 2018 15:48:23 +0000 (-0500)
Subject: Merge branch 'tor-github/pr/501'
X-Git-Tag: tor-0.4.0.1-alpha~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=342f2b187351f8a41fc0337499c05fb3a673610f;p=thirdparty%2Ftor.git

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

342f2b187351f8a41fc0337499c05fb3a673610f