commit e1f0b9fb1eb6cf8e57655bb9db4224b5ce080d0f Merge: fd3678fa60 8b6e919086 Author: Nick Mathewson nickm@torproject.org Date: Fri May 28 08:03:43 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

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