commit f954514b376e6edbe8b1faba0726bdb46acf7729 parent d04b708b4bd47ee8df6796f19b25f558b2b18e91 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 6 May 2020 16:53:06 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix.
