[tor-commits] [tor/master] Merge branch 'bug9288_rebased'