Commit d3da0770 authored Dec 18, 2018 by Nick Mathewson

Merge branch 'maint-0.3.5'

"ours" merge to avoid version bump

There are no changes