Merge branch 'maint-0.2.8'

(This is an "ours" merge to avoid taking the version bump)
This commit is contained in:
Nick Mathewson 2016-05-26 21:09:22 -04:00
commit a93b6bbf17

Diff content is not available