From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 6 May 2020 20:54:12 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.5~12^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1365b91ff43e6e520b9a881f720767418daccf6;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3

This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078
fix.
---

a1365b91ff43e6e520b9a881f720767418daccf6