From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 18 Oct 2019 16:27:12 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~298
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2a42a1ab0bbea00e24718f0ff3b9c6538aaa802;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'
---

e2a42a1ab0bbea00e24718f0ff3b9c6538aaa802