[tor-commits] [tor-browser-build/master] Merge commit '4674d8a76619eb05562d81b3f77756cce1ebfe9d'