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

[nickm at torproject.org]

commit 6e01d5e68506056b1c9ec6b19a60911b15512bd8
Merge: 5aaecf6d0 c9751e261
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 13:14:22 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.2
    
    `-s ours` to avoid version bump.