From: teor <teor@torproject.org>
Date: Thu, 28 Feb 2019 00:49:33 +0000 (+1000)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~50^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de0969ef7816d54acdcc9f1e2960d8bbc4400ecf;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into maint-0.3.5
---

de0969ef7816d54acdcc9f1e2960d8bbc4400ecf