@nmathewson
nmathewson Merge branch 'maint-0.2.6' into maint-0.2.7
7c25b41 Jul 5, 2016
Merge branch 'maint-0.2.6' into maint-0.2.7
7c25b41