Commit a1365b91 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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.
parents 2cd1c076 28ac17f4

There are no changes