Commit 42c0358c authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

Merge branch 'maint-0.4.2' into maint-0.4.3

`-s ours` to avoid version bump.
parents 7ba84934 49b4d176
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