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