[tor-commits] [sandboxed-tor-browser/master] fixup! Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks.

[yawning at torproject.org]

commit 4cd7ad592166c8146c0f1493e69fea66cc057c19
Author: Yawning Angel <yawning at schwanenlied.me>
Date:   Thu Aug 3 17:32:37 2017 +0000

    fixup! Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks.
---
 ChangeLog                  | 1 +
 data/installer/mozilla.cfg | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 89e69a5..fab4f9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Changes in version 0.0.13 - UNRELEASED:
  * Bug 13170: Disable the rest of the Firefox experiments botnet prefs.
+ * Use lockPref for the IDN override done as part of #22984.
 
 Changes in version 0.0.12 - 2017-08-01:
  * Bug 22969: Disable the addon blocklist.
diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg
index 71ea6f5..040d80e 100644
--- a/data/installer/mozilla.cfg
+++ b/data/installer/mozilla.cfg
@@ -41,7 +41,7 @@ lockPref("network.allow-experiments", false);
 lockPref("experiments.manifest.uri", "");
 
 // Force IDNs to be displayed as punycode to thwart homograph attacks.
-defaultPref("network.IDN_show_punycode", true);
+lockPref("network.IDN_show_punycode", true);
 
 // Anything that tries to blur the line between CA signed HTTPS and Onion
 // Services is misguided at best.