From: David Goulet <dgoulet@torproject.org>
Date: Thu, 2 Jul 2020 11:20:57 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.2
X-Git-Tag: tor-0.4.2.8~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07d8d398ca8961d2d9155a2df9c7ced6b382e73b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.2
---

07d8d398ca8961d2d9155a2df9c7ced6b382e73b