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

Merge branch 'maint-0.4.2'
---

65c0df4dbf84cd5f72d43f6a200fc5c59c0bf19f