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

[nickm at torproject.org]

commit 2ddd45bdb8dcf018eebe19b84e637c8bfb630ec1
Merge: 896ab165d9 e1f0b9fb1e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri May 28 08:03:43 2021 -0400

    Merge branch 'maint-0.4.6'

 scripts/git/git-resquash.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)