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

Merge branch 'maint-0.3.4'

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

937c1a3830b117514898adb083b25936da22eb0d