Merge branch 'mozilla:master' into master

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index a609de07050f2d21628b2e561262268cffc19af6..f1701f43507343a76496b889c752def570eea57d 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -601,7 +601,7 @@
                <key>SocksVersion</key>
                <string>4</string>
                <key>Passthrough</key>
-               <string>&lt;local&rt;</string>
+               <string>&lt;local&gt;</string>
                <key>AutoConfigURL</key>
                <string>URL_TO_AUTOCONFIG</string>
                <key>AutoLogin</key>