[tor-commits] [tor-browser-bundle/master] Merge branch gk's 'bug_11249_1' into bug_11249