From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 21 Sep 2018 13:36:31 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.3-alpha~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b0a17a74f5d8cd7c5d8a07dd275e7d96bd4fd35;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

9b0a17a74f5d8cd7c5d8a07dd275e7d96bd4fd35