Merge branch 'maint-0.2.8' into maint-0.2.9

This is an "ours" merge to avoid taking a version bump
This commit is contained in:
Nick Mathewson 2017-02-28 10:38:31 -05:00
commit 3e07a54928

Diff content is not available