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

[nickm at torproject.org]

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 9 16:01:22 2019 -0500

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