Merge remote-tracking branch 'origin/maint-0.2.6'

This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev
This commit is contained in:
Nick Mathewson 2015-07-12 16:37:59 -04:00
commit eb4604c35a

Diff Content Not Available