From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Jun 2018 13:01:06 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~386
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d46969e8208394640d9fe84edbc428329d4ec642;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'

"Ours" merge to avoid version bump.
---

d46969e8208394640d9fe84edbc428329d4ec642