Commit 70161785 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 af08dad6 5aaecf6d

There are no changes