Commit 261f4c3f authored Jul 29, 2016 by Nick Mathewson

Merge branch 'maint-0.2.8'

("Ours" merge, to avoid bumping version in master)

There are no changes