commit f8d028e14a301a77696144fd2bcab91becf51921 Merge: 6d11a0c61f 8b6e919086 Author: Nick Mathewson <nickm@torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)