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

Merge branch 'maint-0.4.2'
---

da59dee5d4d791ad46d3b3d69bcd880c1a5335bb