Merge branch 'maint-0.2.9' into maint-0.3.3

This commit is contained in:
Nick Mathewson 2018-10-15 12:47:46 -04:00
commit 86e0be421f