From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 11 Apr 2019 18:29:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/887'
X-Git-Tag: tor-0.4.1.1-alpha~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d549440124be04986cc7a2b8cb98bd878fca5532;p=thirdparty%2Ftor.git

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

d549440124be04986cc7a2b8cb98bd878fca5532