From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 16 Nov 2018 13:28:59 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5'
X-Git-Tag: tor-0.4.0.1-alpha~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=306098f851e936ab253f4ef3b815d4e9bf23eca7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5'

"ours" to avoid version bump.
---

306098f851e936ab253f4ef3b815d4e9bf23eca7