[tor-commits] [tor/master] Merge commit 'origin/maint-0.2.6^'