Merge branch 'maint-0.3.2'

This commit is contained in:
Nick Mathewson
2017-10-26 09:08:52 -04:00