[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.0

[nickm at torproject.org]

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 5 13:30:32 2019 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.0
    
    "ours" to avoid version bump.