From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 May 2020 14:25:27 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.1
X-Git-Tag: tor-0.4.2.8~20^2^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaint-0.4.1;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.1
---

768ffb8f43575baac0970659b01e0a484d6bd6de