From: teor <teor@torproject.org>
Date: Fri, 5 Apr 2019 23:33:20 +0000 (+1000)
Subject: Merge branch 'maint-0.3.4' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~40^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748;p=thirdparty%2Ftor.git

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

3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748