From: teor <teor@torproject.org>
Date: Tue, 22 Oct 2019 23:59:07 +0000 (+1000)
Subject: Merge branch 'maint-0.4.1' into maint-0.4.2
X-Git-Tag: tor-0.4.2.3-alpha~3^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65545e13452bf042087bc99e7a998427941eee79;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1' into maint-0.4.2

`git merge --strategy ours` to use STATIC for unit tests in
maint-0.4.2.
---

65545e13452bf042087bc99e7a998427941eee79