From: teor <teor@torproject.org>
Date: Tue, 26 Mar 2019 23:36:26 +0000 (+1000)
Subject: Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
X-Git-Tag: tor-0.4.0.4-rc~24^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ae8d663ea9006c9e20f48868d96877984652e16;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
---

9ae8d663ea9006c9e20f48868d96877984652e16