Merge branch 'maint-0.2.6' into release-0.2.6

This commit is contained in:
Nick Mathewson 2015-04-06 10:03:26 -04:00
commit 9ccf019b16

Diff Content Not Available