From: teor <teor@torproject.org>
Date: Mon, 25 Nov 2019 02:37:15 +0000 (+1000)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.5~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d6545250e49b732292bb8ac1a3f01d198537b0b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1' into maint-0.4.2
---

3d6545250e49b732292bb8ac1a3f01d198537b0b