Merge branch 'maint-0.2.8' into maint-0.2.9

"Ours" merge to avoid bumping version.
This commit is contained in:
Nick Mathewson 2016-12-08 11:03:08 -05:00
commit f9636ebc2f

Diff Content Not Available