[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40002_v2'