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.
This commit is contained in:
Nick Mathewson 2020-05-06 16:54:12 -04:00
commit a1365b91ff

Diff Content Not Available