[tor-commits] [tor/master] Merge branch 'maint-0.4.1' into maint-0.4.2

[teor at torproject.org]

commit 65545e13452bf042087bc99e7a998427941eee79
Merge: b45048fea 8bc65cda4
Author: teor <teor at torproject.org>
Date:   Wed Oct 23 09:59:07 2019 +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.