From: Roger Dingledine <arma@torproject.org>
Date: Sun, 20 Oct 2019 09:56:16 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aab5d90858beb7eb9738c237dab5bcb7dd6ce91f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'
---

aab5d90858beb7eb9738c237dab5bcb7dd6ce91f