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

Merge branch 'maint-0.3.4'
---

bcc1368c77d6ed8ac7f8bd81acdec7bb2da9f925