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

Merge branch 'maint-0.4.2'
---

264c5312eb7fc70b092b22ec978c1b400b7fd826