[tbb-commits] [tor-browser-build/master] Pick up latest fixes for #30489