Commit f5d89fab authored Dec 21, 2017 by Nick Mathewson

Merge branch 'maint-0.3.2'

"ours" to avoid version bump.

There are no changes