From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 May 2019 13:11:20 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/950'
X-Git-Tag: tor-0.4.1.1-alpha~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4973ceb46b2b969906a4574d5aa608512c5bf83d;p=thirdparty%2Ftor.git

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

4973ceb46b2b969906a4574d5aa608512c5bf83d