[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'gk/bug_23231'