commit a1365b91ff43e6e520b9a881f720767418daccf6 Merge: 2cd1c0765 28ac17f43 Author: Nick Mathewson nickm@torproject.org Date: Wed May 6 16:54:12 2020 -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.