[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40318'