From: teor <teor@torproject.org>
Date: Tue, 14 Jan 2020 07:41:44 +0000 (+1000)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8095c785f1929b379ab3341b42cbdb05c7598950;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'
---

8095c785f1929b379ab3341b42cbdb05c7598950