From: David Goulet <dgoulet@torproject.org>
Date: Wed, 4 Sep 2019 12:33:28 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a816742f3736adf29cb49253c1b8f3ba6af1eca2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'
---

a816742f3736adf29cb49253c1b8f3ba6af1eca2