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

Merge branch 'maint-0.4.2'
---

7c5716d162f2109f246fbd369185c973dd60b22b