From: teor <teor@torproject.org>
Date: Fri, 19 Apr 2019 01:47:50 +0000 (+1000)
Subject: Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
X-Git-Tag: tor-0.4.1.1-alpha~4^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4a66c2d63634529dc409e4756ba3ffa461444519;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
---

4a66c2d63634529dc409e4756ba3ffa461444519