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

Diff content is not available