[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25554_v2'