Commit 9b88254d authored May 15, 2017 by Nick Mathewson

Merge branch 'maint-0.3.0'

"ours" merge to avoid feature bump

There are no changes