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

Merge branch 'maint-0.4.2'
---

f58439ee55512d8deb29272b0beadad43036c7fe