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

[nickm at torproject.org]

commit 7082cc16841f29183187dfa369749942cf8f1564
Merge: 2944b091f b2a6b5282
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 25 09:01:20 2019 -0400

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