Commit 876aeeb2 authored Dec 12, 2016 by Nick Mathewson

Merge branch 'maint-0.2.9'

Ours merge to avoid taking version bump.

There are no changes