From: teor <teor@torproject.org>
Date: Fri, 25 Oct 2019 00:38:22 +0000 (+1000)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~253
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a91f52a443e605a5b8efd4fe0d4032512c23b6cd;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'
---

a91f52a443e605a5b8efd4fe0d4032512c23b6cd