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

[nickm at torproject.org]

commit 36a27fa2d331c53802635431849ca9a400122a4e
Merge: e5812c91d ab92881d9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 11:36:55 2019 -0400

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