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

[nickm at torproject.org]

commit 190cda0e2ba2faa300758f4899a6c28de6886bfc
Merge: a17f4b11b cb69a5a11
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 18 12:17:11 2020 -0400

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