From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Dec 2018 13:29:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'tor-github/pr/561'
X-Git-Tag: tor-0.4.0.1-alpha~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4002a84ffe97480b6bd67cbfb9c65d19457f41fe;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/561'
---

4002a84ffe97480b6bd67cbfb9c65d19457f41fe