[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

[nickm at torproject.org]

commit 55e329fdc19becc8c056c4852ba39bc44b9705c6
Merge: 6260db5733 fd38609ae2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 16 08:21:15 2021 -0400

    Merge branch 'maint-0.4.6'
    
    "ours" to avoid version bump.