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

Merge branch 'maint-0.3.4'
---

cd3f9572199c254e6c7896b61b361061919021bb