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

[nickm at torproject.org]

commit f8df0f5f32a1deaeb329ad78f05d209173c5f458
Merge: bb786797a 8933c7908
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 5 13:32:06 2019 -0500

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