Merge branch 'maint-0.2.9' into maint-0.3.0

This is an "ours" merge to avoid a version bump.
This commit is contained in:
Nick Mathewson 2017-02-28 10:39:29 -05:00
commit 4128a8cabd

Diff Content Not Available