[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'phw/bug_40212'