[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30585_v2'