commit 70161785f94ee9e1571af4ec804bf57f877f40e8 parent af08dad6d1b00f1f433787d2712568b07f782729 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 9 Jul 2020 10:30:46 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 `-s ours` to avoid version bump.