Merge branch 'maint-0.3.1' into maint-0.3.2

This commit is contained in:
Nick Mathewson 2018-06-13 09:59:28 -04:00
commit 7e7585d0a1