From: teor <teor@torproject.org>
Date: Tue, 3 Dec 2019 02:47:05 +0000 (+1000)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4c22164c022aee8db962a08039bc6f1c3905585;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'
---

a4c22164c022aee8db962a08039bc6f1c3905585