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

Merge branch 'maint-0.3.4'
---

5acbcf150e7c75f0a9bf6e9d8a4f6f5bec7d549a