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

Merge branch 'maint-0.4.2'
---

7c88fcf4e2ed04af07fed9438b59764f1b4adab0