From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Jul 2020 17:14:22 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.2
X-Git-Tag: tor-0.4.3.7~34^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e01d5e68506056b1c9ec6b19a60911b15512bd8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.2

`-s ours` to avoid version bump.
---

6e01d5e68506056b1c9ec6b19a60911b15512bd8