[tor-commits] [tor/master] Merge branch 'maint-0.2.6' of git-rw.torproject.org:/tor into maint-0.2.6