[tbb-commits] [tor-browser-bundle/maint-4.0] Merge branch 'isis/bug13504' into maint-4.0