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

[nickm at torproject.org]

commit 3d3dc08ed8782e88f1e87a9550b9f18751c5732a
Merge: 6338c35e9d 665083be9f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 9 17:13:25 2020 -0500

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