[tor-commits] [tor/master] Merge branch 'bug9495_redux_v2' into maint-0.2.6