From: Roger Dingledine <arma@torproject.org>
Date: Wed, 20 Feb 2019 15:36:54 +0000 (-0500)
Subject: Merge branch 'maint-0.4.0'
X-Git-Tag: tor-0.4.1.1-alpha~216
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0'
---

4d4eda89a1d0f3b19b408349d602bf7ba47e1cdb