Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump.
This commit is contained in:
Nick Mathewson 2017-09-14 13:21:28 -04:00
commit f7b06202c7

Diff Content Not Available