Merge branch 'maint-0.2.8' into maint-0.2.9

"Ours" merge to avoid version bump.
This commit is contained in:
Nick Mathewson 2016-12-19 10:12:34 -05:00
commit 8f043ffc64

Diff Content Not Available