Commit 36885f34 authored Sep 07, 2018 by Nick Mathewson

Merge branch 'maint-0.2.9' into maint-0.3.2

"ours" to avoid bump

There are no changes