[tor-commits] [tor-browser-spec/master] Merge branch !6 into master