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

Merge branch 'maint-0.3.5' into maint-0.4.2

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

78285594f51fc0009d3911fb894e12b793536a5d