commit 2f4fa423c30c81092f06fb97c20f5d281b3cfac7 parent 2c1a49c4640d807ce0abfd01a011e5d4cc240f69 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 13 Mar 2020 16:57:03 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.