From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 7 Aug 2018 12:05:56 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e86a2868319f8aa55d2858fdb4d83e6f9f69120;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

5e86a2868319f8aa55d2858fdb4d83e6f9f69120