commit 65545e13452bf042087bc99e7a998427941eee79 parent b45048feaf0db75108333f86e0d70e08e8a90382 Author: teor <teor@torproject.org> Date: Wed, 23 Oct 2019 09:59:07 +1000 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.