Merge branch 'maint-0.3.3' into release-0.3.3

This commit is contained in:
Nick Mathewson
2018-03-21 17:10:10 -04:00