Commit 14edb0bd authored Dec 11, 2016 by Nick Mathewson

Merge branch 'maint-0.2.9'

"ours" merge to avoid taking version bump

There are no changes