From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 15 Aug 2018 16:20:57 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~146
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34083f00aba63f00577bf8612e945affc5409270;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

34083f00aba63f00577bf8612e945affc5409270