Merge branch 'maint-0.3.0' into maint-0.3.1

This commit is contained in:
Nick Mathewson
2017-12-12 09:13:12 -05:00