Merge branch 'maint-0.2.9' into release-0.2.9

This commit is contained in:
Nick Mathewson 2016-12-07 18:28:39 -05:00
commit 9ead4e926f

Diff Content Not Available