[tbb-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug13016' into tor-browser-31.1.1esr-4.x-1