[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.6' into release-0.4.6

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