From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Jul 2018 14:42:29 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~190
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=583df33e2079c6f7b5e0ebe34b5f29d8739a673b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'
---

583df33e2079c6f7b5e0ebe34b5f29d8739a673b