Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" to avoid taking a second instance of 27797.
This commit is contained in:
Nick Mathewson 2018-10-24 12:57:14 -04:00
commit c78904b630

Diff Content Not Available