commit a1365b91ff43e6e520b9a881f720767418daccf6 parent 2cd1c0765834087797455301dbc2c941b71036a3 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 6 May 2020 16:54:12 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 This is an "ours" merge to avoid taking the maint-0.4.2 version of the 34078 fix.
