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

Merge branch 'maint-0.3.4'
---

152e4a1e5036e9456f98f7c647a3dc72d24b0f5e