[tbb-commits] [tor-browser-build/master] Pick up fixes for rbm#40020 and rbm#40026