Merge branch 'maint-0.3.0'

This commit is contained in:
Nick Mathewson 2017-03-01 07:52:51 -05:00
commit 39d0e0cd0b