From: Roger Dingledine <arma@torproject.org>
Date: Tue, 5 Feb 2019 13:10:02 +0000 (-0500)
Subject: Merge branch 'maint-0.3.4' into release-0.3.4
X-Git-Tag: tor-0.3.4.11~6
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d0f969a43708436e0e4c7181f0426b497649bc42;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4' into release-0.3.4
---

d0f969a43708436e0e4c7181f0426b497649bc42