From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 9 Jul 2018 13:24:37 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~249
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47859e11e505cd6c2437fb8006de44297b6b9d2f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'

"Ours" to avoid version bump.
---

47859e11e505cd6c2437fb8006de44297b6b9d2f