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

Merge branch 'maint-0.4.2'
---

1cdc030c3d3afbe16461271a1147397f87ba5693