Commit 17561434 authored by Nick Mathewson's avatar Nick Mathewson 🌉
Browse files

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.
parents 3248630f 7174a80e
Supports Markdown
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