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

[nickm at torproject.org]

commit 6b180703a293991849b91160cf6070d7d570738f
Merge: d0b62fff0 3b2a73207
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 20 11:15:57 2019 -0400

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