From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 30 Jul 2018 13:01:59 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~179
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba1bb90a726ead9a5bb8a8fa6f14d31b06822258;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

ba1bb90a726ead9a5bb8a8fa6f14d31b06822258