From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 13 Mar 2020 20:56:44 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.1
X-Git-Tag: tor-0.4.1.9~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a9e2a261b44b93e244c04593dee8f7757ba32bc;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.
---

7a9e2a261b44b93e244c04593dee8f7757ba32bc