Merge branch 'maint-0.2.9'

This is an "ours" merge to avoid taking the version bump.
This commit is contained in:
Nick Mathewson 2016-11-07 16:39:15 -05:00
commit 0d6ee26af9

Diff Content Not Available