From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Feb 2020 19:17:10 +0000 (-0500)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.2-alpha~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9144700af5602cc267c0d147145c100567fdbb3;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'
---

d9144700af5602cc267c0d147145c100567fdbb3