From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 8 Nov 2018 14:01:08 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ef6e1d440c2788ba0beea266c7dc9bea3c010d4;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'

"ours" to avoid version bump.
---

4ef6e1d440c2788ba0beea266c7dc9bea3c010d4