commit 8a17999da3626a5f9e8922277151624cd0526fba
Merge: 0d14ac1e0e 21317c9229
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 3 13:39:08 2021 -0500
    Merge branch 'maint-0.3.5' into maint-0.4.3
    
    "ours" to avoid version bump.