From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 6 Aug 2018 12:29:44 +0000 (-0400)
Subject: Merge branch 'maint-0.3.4'
X-Git-Tag: tor-0.3.5.1-alpha~165
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c165cb7f57c6af842c5f1c117a99da8b5a3d50d7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.4'

"ours" to avoid version bump.
---

c165cb7f57c6af842c5f1c117a99da8b5a3d50d7