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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment