Commit d1995197 authored Jan 07, 2019 by Nick Mathewson

Merge branch 'maint-0.3.5'

"ours" to avoid version bump.

There are no changes