From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 May 2019 12:10:16 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4' into release-0.3.4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.3.4;p=thirdparty%2Ftor.git

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

e2dde342b240039c9d4a254a2313fa9ab53d49d7