[tor-commits] [tor-browser] 289/311: Fixing a typo in a merge conflict Bug 1761460 a=me