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

[nickm at torproject.org]

commit c5e610af05dc7112a9b3aa18feeb6ba63290ff5c
Merge: 49cffee63 7afb95d3e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 30 11:19:23 2020 -0500

    Merge branch 'maint-0.4.1' into maint-0.4.2
    
    Using "ours" strategy to avoid version bump