Merge branch 'maint-0.3.5'

Used "git merge -s ours" to avoid taking the revert of 28731.
This commit is contained in:
Nick Mathewson 2018-12-18 08:09:53 -05:00
commit 8d5ad8cd34

Diff Content Not Available