November 2016 - tor-commits - lists.torproject.org

[torbirdy/develop] Don't deal with some account settings twice.
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 56150f9c520a4d995a2f187471a462395ca8760e Author: anonym <anonym(a)riseup.net> Date: Thu Mar 10 00:58:40 2016 +0100 Don't deal with some account settings twice. We already deal with these in fixupTorbirdySettingsOnNewAccount() through prefs. --- chrome/content/emailwizard.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index fc2d48e..30024ac 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -81,10 +81,6 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { config.incoming.auth = 3; config.outgoing.auth = 3; - // Set default values to disable automatic email fetching. - config.incoming.loginAtStartup = false; - config.incoming.downloadOnBiff = false; - // Default the outgoing SMTP port. config.outgoing.port = 465;

1 0

[torbirdy/develop] Merge branch 'master' into post-secure-autoconfig
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 188fbd679a85dc8909bf0eff46b840112a2bd54b Merge: 89bf536 caaf2b5 Author: Ulrike Uhlig <u(a)451f.org> Date: Wed May 4 13:00:23 2016 +0200 Merge branch 'master' into post-secure-autoconfig Makefile | 6 ++++++ chrome/content/emailwizard.js | 4 ++++ components/torbirdy.js | 22 +++++++++++++++++++++- defaults/preferences/prefs.js | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --cc chrome/content/emailwizard.js index 30024ac,123753b..8218c1b --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@@ -133,11 -136,17 +133,15 @@@ if(!org.torbirdy.emailwizard) org.torbi }; pub.onLoad = function() { - if (disableWizard) { + if (disableAutoConfiguration) { document.getElementById("torbirdy-protocol-box").collapsed = true; - document.getElementById("provisioner_button").disabled = false; - document.getElementById("provisioner_button").hidden = false; - } else { - document.getElementById("provisioner_button").disabled = true; - document.getElementById("provisioner_button").hidden = true; } + document.getElementById("provisioner_button").disabled = true; + document.getElementById("provisioner_button").hidden = true; ++ + // 0 is for POP3 (default), 1 is for IMAP. See emailwizard.xul and prefs.js. + var selectProtocol = prefs.getIntPref("extensions.torbirdy.defaultprotocol") + document.getElementById("torbirdy-protocol").selectedIndex = selectProtocol; }; return pub;

1 0

[torbirdy/develop] Reflect TorBirdy's state in UI after uninstall/disable (#10683)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 26a0def110411e65f0abad893533a705d30a4424 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 17:28:35 2016 -0400 Reflect TorBirdy's state in UI after uninstall/disable (#10683) When TorBirdy is uninstalled or disabled, the status bar text and colour is updated to reflect TorBirdy's current state. Prior to this commit, if a user uninstalled/disabled TorBirdy, the status bar text would still say "TorBirdy Enabled". Now the status bar is updated as TorBirdy's state changes to avoid confusing the user. --- chrome/content/overlay.js | 2 +- chrome/locale/en/torbirdy.properties | 1 + components/torbirdy.js | 31 +++++++++++++++++++++++++------ install.rdf | 2 +- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/chrome/content/overlay.js b/chrome/content/overlay.js index f8b1051..1f72c9d 100644 --- a/chrome/content/overlay.js +++ b/chrome/content/overlay.js @@ -67,7 +67,7 @@ prefs.setBoolPref("extensions.torbirdy.whonix_run", false); } else { - myPanel.label = strbundle.getString("torbirdy.enabled.disabled"); + myPanel.label = strbundle.getString("torbirdy.disabled"); myPanel.style.color = "red"; } } diff --git a/chrome/locale/en/torbirdy.properties b/chrome/locale/en/torbirdy.properties index 2e01136..4f645eb 100644 --- a/chrome/locale/en/torbirdy.properties +++ b/chrome/locale/en/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy Enabled: Custom Proxy torbirdy.enabled.torification=TorBirdy Enabled: Transparent Torification torbirdy.enabled.whonix=TorBirdy Enabled: Whonix torbirdy.disabled=TorBirdy: Disabled! +torbirdy.enabled=TorBirdy: Enabled torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. diff --git a/components/torbirdy.js b/components/torbirdy.js index ead2508..eb64df6 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -1,9 +1,8 @@ -Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); -Components.utils.import("resource://gre/modules/AddonManager.jsm"); +var { interfaces: Ci, utils: Cu, classes: Cc } = Components; -var Ci = Components.interfaces; -var Cc = Components.classes; -var Cr = Components.results; +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/imXPCOMUtils.jsm"); +Cu.import("resource://gre/modules/AddonManager.jsm"); var SERVICE_CTRID = "@torproject.org/torbirdy;1"; var SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); @@ -14,6 +13,10 @@ var kPrefBranch = "extensions.torbirdy.custom."; var kRestoreBranch = "extensions.torbirdy.restore."; var kTorBirdyBranch = "extensions.torbirdy."; +XPCOMUtils.defineLazyGetter(this, "_", () => + l10nHelper("chrome://castironthunderbirdclub/locale/torbirdy.properties") +); + // Default preference values for TorBirdy. // These preferences values will be "enforced": even if the user decides to // change the preferences listed below, they will be reset to the TorBirdy @@ -380,7 +383,7 @@ var TorBirdyOldPrefs = [ // is rounded down to the nearest minute. function sanitizeDateHeaders() { // Import the jsmime module that is used to generate mail headers. - let { jsmime } = Components.utils.import("resource:///modules/jsmime.jsm"); + let { jsmime } = Cu.import("resource:///modules/jsmime.jsm"); // Inject our own structured encoder to the default header emitter, // to override the default Date encoder with a rounded-down version. jsmime.headeremitter.addStructuredEncoder("Date", function (date) { @@ -438,7 +441,22 @@ TorBirdy.prototype = { // This is a hack to cause Thunderbird to instantiate us ASAP! _xpcom_categories: [{ category: "profile-after-change"}, ], + onStateChange: function() { + let panel = Cc['@mozilla.org/appshell/window-mediator;1'] + .getService(Ci.nsIWindowMediator) + .getMostRecentWindow('mail:3pane').document.getElementById("torbirdy-my-panel"); + if (this._uninstall) { + panel.label = _("torbirdy.enabled"); + panel.style.color = "green"; + } + else { + panel.label = _("torbirdy.disabled"); + panel.style.color = "red"; + } + }, + onUninstalling: function(addon, needsRestart) { + this.onStateChange(); if (addon.id == TB_ID) { dump("Nooo! TorBirdy uninstall requested\n"); this._uninstall = true; @@ -447,6 +465,7 @@ TorBirdy.prototype = { }, onOperationCancelled: function(addon) { + this.onStateChange(); if (addon.id == TB_ID) { dump("Uninstall requested cancelled. Yayay!\n"); this._uninstall = false; diff --git a/install.rdf b/install.rdf index 34c634c..ffe53cd 100644 --- a/install.rdf +++ b/install.rdf @@ -12,7 +12,7 @@  <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> - <em:minVersion>38.*</em:minVersion> + <em:minVersion>37.*</em:minVersion> <em:maxVersion>45.*</em:maxVersion> </Description> </em:targetApplication>

1 0

[torbirdy/develop] Update comment for last commit
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit b18407669b898a091706485738f9523da1d95508 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 19 09:55:39 2016 -0400 Update comment for last commit --- components/torbirdy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index a113323..9c930e8 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -351,7 +351,7 @@ var TorBirdyPrefs = { // Disable downloadable fonts. "gfx.downloadable_fonts.enabled": false, - // Disable remote images. + // Disable third-party images. "permissions.default.image": 3, /*

1 0

[torbirdy/develop] Replace 'var' with 'let' for iterations
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit de8d9fa2964132f657f03d3ba27f3ea317c39eba Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 30 06:19:48 2016 -0400 Replace 'var' with 'let' for iterations --- chrome/content/preferences.js | 10 +++++----- components/torbirdy.js | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 682b367..c843d3c 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -77,7 +77,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.clearCustomPrefs = function() { var customPrefs = pub.torBirdyPref.getChildList("", {}); - for (var i = 0; i < customPrefs.length; i++) { + for (let i = 0; i < customPrefs.length; i++) { pub.prefs.clearUserPref(pub.customBranch + customPrefs[i]); } }; @@ -131,7 +131,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { var accountLength = accounts.length; - for (var i = 0; i < accountLength; i++) { + for (let i = 0; i < accountLength; i++) { var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; var name = account.prettyName; @@ -149,7 +149,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { // For email accounts, configure accordingly. var sAccount = null; var account = pub.getAccount(); - for (var i = 0; i < account.length; i++) { + for (let i = 0; i < account.length; i++) { if (account[i].key === pub.mailAccount.value) { sAccount = i; } @@ -324,14 +324,14 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { var accounts = pub.getAccount(); if (pub.fetchAllMails.checked) { pub.prefs.setBoolPref(pub.prefBranch + 'fetchall', true); - for (var i = 0; i < accounts.length; i++) { + for (let i = 0; i < accounts.length; i++) { accounts[i].loginAtStartUp = true; accounts[i].doBiff = true; } } else { pub.prefs.setBoolPref(pub.prefBranch + 'fetchall', false); - for (var i = 0; i < accounts.length; i++) { + for (let i = 0; i < accounts.length; i++) { accounts[i].loginAtStartUp = false; accounts[i].doBiff = false; } diff --git a/components/torbirdy.js b/components/torbirdy.js index 9c930e8..fa1aa6b 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -480,13 +480,13 @@ TorBirdy.prototype = { resetUserPrefs: function() { dump("Resetting user preferences to default\n"); // Clear the Thunderbird preferences we changed. - for (var each in TorBirdyPrefs) { + for (let each in TorBirdyPrefs) { this.prefs.clearUserPref(each); } // Restore the older proxy preferences that were set prior to TorBirdy's install. dump("Restoring proxy settings\n"); - for (var i = 0; i < TorBirdyOldPrefs.length; i++) { + for (let i = 0; i < TorBirdyOldPrefs.length; i++) { var oldPref = TorBirdyOldPrefs[i]; var setValue = kRestoreBranch + oldPref; var type = this.prefs.getPrefType(setValue); @@ -502,14 +502,14 @@ TorBirdy.prototype = { } // Enable plugins. - for(var i = 0; i < this.plugins.length; i++) { + for(let i = 0; i < this.plugins.length; i++) { this.plugins[i].disabled = false; } // Now clear all TorBirdy preferences. var clearPrefs = Cc["@mozilla.org/preferences-service;1"] .getService(Ci.nsIPrefService).getBranch(kTorBirdyBranch).getChildList("", {}); - for (var i = 0; i < clearPrefs.length; i++) { + for (let i = 0; i < clearPrefs.length; i++) { this.prefs.clearUserPref(kTorBirdyBranch + clearPrefs[i]); } }, @@ -517,7 +517,7 @@ TorBirdy.prototype = { setPrefs: function() { // If custom values are set for specific preferences, override the defaults with them. // For each preference, get the type and then set the property. - for (var i = 0; i < this.customPrefs.length; i++) { + for (let i = 0; i < this.customPrefs.length; i++) { var typePref = this.prefs.getPrefType(this.customPrefs[i]); // String. if (typePref === 32) { @@ -534,7 +534,7 @@ TorBirdy.prototype = { TorBirdyPrefs[this.customPrefs[i]] = value; } - for (var each in TorBirdyPrefs) { + for (let each in TorBirdyPrefs) { if (typeof TorBirdyPrefs[each] === "boolean") { this.prefs.setBoolPref(each, TorBirdyPrefs[each]); } @@ -554,7 +554,7 @@ TorBirdy.prototype = { // First copy TorBirdyPrefs to TorBirdyOldPrefs. TorBirdyOldPrefs.push.apply(TorBirdyOldPrefs, Object.keys(TorBirdyPrefs)); - for (var i = 0; i < TorBirdyOldPrefs.length; i++) { + for (let i = 0; i < TorBirdyOldPrefs.length; i++) { var oldPref = TorBirdyOldPrefs[i]; var type = this.prefs.getPrefType(oldPref); // String. @@ -588,7 +588,7 @@ TorBirdy.prototype = { this.prefs.setIntPref("network.proxy.ssl_port", 0); // Disable all plugins. - for (var i = 0; i < this.plugins.length; i++) { + for (let i = 0; i < this.plugins.length; i++) { this.plugins[i].disabled = true; } @@ -602,13 +602,13 @@ TorBirdy.prototype = { // which version we are on. var accountLength = accounts.length; - for (var i = 0; i < accountLength; i++) { + for (let i = 0; i < accountLength; i++) { var account = accounts.queryElementAt(i, Ci.nsIMsgAccount); allAccounts.push(account); } // Save account settings for restoring later. - for (var i = 0; i < allAccounts.length; i++) { + for (let i = 0; i < allAccounts.length; i++) { var identities = allAccounts[i].identities; var account = allAccounts[i].incomingServer; @@ -617,14 +617,14 @@ TorBirdy.prototype = { if (account.type === "imap") { var identLength = identities.length; - for (var ident = 0; ident < identLength; ident++) { + for (let ident = 0; ident < identLength; ident++) { var identity = identities.queryElementAt(ident, Ci.nsIMsgIdentity); var key = identity.key; // We need to restore the following preferences after we are uninstalled/disabled. var restorePrefs = ["draft_folder", "drafts_folder_picker_mode"]; - for (var p = 0; p < restorePrefs.length; p++) { + for (let p = 0; p < restorePrefs.length; p++) { var pref = "mail.identity.%id%.".replace("%id%", key); var prefName = pref + restorePrefs[p]; if (this.prefs.prefHasUserValue(prefName)) { @@ -646,7 +646,7 @@ TorBirdy.prototype = { var restorePrefs = ["check_new_mail", "login_at_startup", "check_time", "download_on_biff", "socketType", "port", "authMethod"]; - for (var j = 0; j < restorePrefs.length; j++) { + for (let j = 0; j < restorePrefs.length; j++) { var pref = "mail.server.%serverkey%.".replace("%serverkey%", key); var prefName = restorePrefs[j]; var prefToCall = pref + prefName;

1 0

[torbirdy/develop] Update comments and fix typo
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 454ceb1023f316331bc5e800aaf3969c22c92266 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jun 6 01:14:52 2016 -0400 Update comments and fix typo --- chrome/content/emailwizard.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/chrome/content/emailwizard.js b/chrome/content/emailwizard.js index 2c0828a..2da6ad7 100644 --- a/chrome/content/emailwizard.js +++ b/chrome/content/emailwizard.js @@ -130,11 +130,12 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { window.close(); } else { + // If the autoconfig wizard is enabled, or we are running in Tails. var prefer_pop = Preferences.get("extensions.torbirdy.defaultprotocol") != 1; - // Both of these monkeypatches hook in only to change the - // selection default (POP vs IMAP according to our pref) at - // suitable times, i.e. when the page has been pre-filled and is - // finally presented to user action. + // Both of these monkeypatches hook in only to change the selection + // default (POP vs IMAP according to our pref) at suitable times, i.e. + // when the page has been pre-filled and is finally presented to user + // action. var result_imappop_hacks_run_once = false; var old_displayConfigResult = gEmailConfigWizard.displayConfigResult; gEmailConfigWizard.displayConfigResult = function(config) { @@ -143,9 +144,9 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { if (radiogroup.hidden) { return; } - // We can only run the monkeypatch code below once -- this - // method is called every time we change selection, preventing - // us from changing the selection away from POP. + // We can only run the monkeypatch code below once -- this method is + // called every time we change selection, preventing us from changing + // the selection away from POP. if (result_imappop_hacks_run_once) { return; } @@ -161,7 +162,7 @@ if(!org.torbirdy.emailwizard) org.torbirdy.emailwizard = new function() { gEmailConfigWizard._fillManualEditFields = function(config) { old_fillManualEditFields.call(this, config); if (prefer_pop) { - // In this itemlist, POP is located at index 1. + // In this itemlist, POP3 is located at index 1. document.getElementById("incoming_protocol").selectedIndex = 1; gEmailConfigWizard.onChangedProtocolIncoming(); }

1 0

[torbirdy/develop] Remove redundant patches and associated overlays for #6314 and #6315
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 6b53dfaa246f46ae83abd3e2edf5dd12643c2ec6 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 17:43:23 2016 -0400 Remove redundant patches and associated overlays for #6314 and #6315 Patches for the above two bugs have been merged upstream by Arthur Edelstein and our patches and the overlay for the messenger window are redundant. See the above tickets for more information. --- Makefile | 4 +- chrome.manifest | 1 - chrome/content/composeoverlay.js | 85 ------------------------- chrome/content/composeoverlay.xul | 7 -- chrome/skin/contents.rdf | 4 -- patches/date.patch | 70 -------------------- patches/mailnewspref.patch | 26 -------- patches/messageid.patch | 49 -------------- patches/unified.patch | 130 -------------------------------------- 9 files changed, 2 insertions(+), 374 deletions(-) diff --git a/Makefile b/Makefile index 48c661c..7dca2f9 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,11 @@ VERSION := $(shell cat install.rdf|grep '<em:version>'|cut -d\> -f2|cut -d\< -f1 FAKETIME := 200001010000 make-xpi: - zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" + zip -r ../torbirdy-$(VERSION).xpi * -x "debian/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" make-reproducible: find . -print0 | xargs -0 touch -t $(FAKETIME) - zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x "patches/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" -x *.git* + zip -X ../torbirdy-$(VERSION).xpi `find . | sort` -x "debian/*" -x "ChangeLog" -x "Makefile" -x "gpg.conf" -x "import-translations.sh" -x "README.RELEASE" -x *.git* clean: rm -f ../torbirdy-$(VERSION).xpi diff --git a/chrome.manifest b/chrome.manifest index 33b0a10..d61ecd5 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,7 +1,6 @@ content castironthunderbirdclub chrome/content/ overlay chrome://messenger/content/messenger.xul chrome://castironthunderbirdclub/content/overlay.xul application={3550f703-e582-4d05-9a08-453d09bdfdc6} -overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://castironthunderbirdclub/content/composeoverlay.xul overlay chrome://messenger/content/accountcreation/emailWizard.xul chrome://castironthunderbirdclub/content/emailwizard.xul overlay chrome://messenger-newsblog/content/feedAccountWizard.xul chrome://castironthunderbirdclub/content/feedwizard.xul overlay chrome://messenger/content/AccountWizard.xul chrome://castironthunderbirdclub/content/nntpwizard.xul diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js deleted file mode 100644 index 843cfbc..0000000 --- a/chrome/content/composeoverlay.js +++ /dev/null @@ -1,85 +0,0 @@ -var Ci = Components.interfaces; -var Cc = Components.classes; - -function torbirdyTextRandom() { - // Generate alphanumeric random numbers. - var inChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-=_"; - var randomString = ''; - for (var i = 0; i < 10; i++) { - var num = Math.floor(Math.random() * inChars.length); - randomString += inChars.substring(num, num+1); - } - return randomString; -} - -function torbirdyHexString(charCode) { - return ("0" + charCode.toString(16)).slice(-2); -} - -function send_event_handler(event) { - var msgcomposeWindow = document.getElementById("msgcomposeWindow"); - var msg_type = msgcomposeWindow.getAttribute("msgtype"); - - var prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - - var is_custom_msg_id = prefs.getBoolPref("mailnews.custom_message_id"); - - if (is_custom_msg_id) { - // Only continue if this is an actual send event. - if (!(msg_type == nsIMsgCompDeliverMode.Now || msg_type == nsIMsgCompDeliverMode.Later)) - return; - - // We now generate the custom message-ID based on the approach described in tagnaq's paper. - var to_field = gMsgCompose.compFields.to; - var cc_field = gMsgCompose.compFields.cc; - var subject_field = gMsgCompose.compFields.subject; - - // When a message is forwarded, remove the references header. - // See https://trac.torproject.org/projects/tor/ticket/6392 - if (gMsgCompose.type === 3 || gMsgCompose.type === 4) { - gMsgCompose.compFields.references = ''; - } - - // Get the text of the body. - try { - var editor = GetCurrentEditor(); - var body = editor.outputToString('text/plain', 4); - } catch(ex) { - // We couldn't get the editor. - var body = ''; - } - - // Generate an 'email' and append a random number. The SHA512 hash of this email will be used later. - var mail = to_field + cc_field + subject_field + body + Math.random(); - - // Generate a SHA512 hash of the string above. - var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"] - .createInstance(Ci.nsIScriptableUnicodeConverter); - var ch = Cc["@mozilla.org/security/hash;1"] - .createInstance(Ci.nsICryptoHash); - converter.charset = "UTF-8"; - - var result = {}; - var data = converter.convertToByteArray(mail, result); - ch.init(ch.SHA512); - ch.update(data, data.length); - - var hash = ch.finish(false); - var pref_hash = [torbirdyHexString(hash.charCodeAt(i)) for (i in hash)].join("").slice(0, 40); - // Randomize characters to upper case and lower case. - var choices = [true, false]; - pref_hash = [choices[Math.floor(Math.random() * choices.length)] ? - e.toUpperCase() : e.toLowerCase() for each (e in pref_hash.split(""))].join(""); - - // Introduce more randomness. - var randomString = torbirdyTextRandom(); - var message_id = pref_hash + randomString; - - // Set the preference to use the custom generated header ID. - // This is the message-ID that will be used in the outgoing message. - prefs.setCharPref("mailnews.header.custom_message_id", message_id); - } -} - -window.addEventListener("compose-send-message", send_event_handler, true); diff --git a/chrome/content/composeoverlay.xul b/chrome/content/composeoverlay.xul deleted file mode 100644 index b9e8aea..0000000 --- a/chrome/content/composeoverlay.xul +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<overlay id="castironthunderbirdclub-compose-overlay" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - - <script type="application/javascript" src="chrome://castironthunderbirdclub/content/composeoverlay.js" /> - -</overlay> diff --git a/chrome/skin/contents.rdf b/chrome/skin/contents.rdf index 219e790..28d6c2e 100644 --- a/chrome/skin/contents.rdf +++ b/chrome/skin/contents.rdf @@ -19,7 +19,6 @@ <li resource="chrome://global/content/customizeToolbar.xul"/>  <li resource="chrome://messenger/content/messenger.xul"/> - <li resource="chrome://messenger/content/messengercompose/messengercompose.xul"/> </Seq> <Seq about="chrome://global/content/customizeToolbar.xul"> @@ -30,8 +29,5 @@ <Seq about="chrome://messenger/content/messenger.xul"> <li>chrome://castironthunderbirdclub/skin/castironthunderbirdclub.css</li> </Seq> - <Seq about="chrome://messenger/content/messengercompose/messengercompose.xul"> - <li>chrome://castironthunderbirdclub/skin/castironthunderbirdclub.css</li> - </Seq> </RDF> diff --git a/patches/date.patch b/patches/date.patch deleted file mode 100644 index eb3883c..0000000 --- a/patches/date.patch +++ /dev/null @@ -1,70 +0,0 @@ -# HG changeset patch -# Parent ec138f1fcabf10f11ba4a4ba662cba34ab625691 -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Added support for removing the Date header - - -diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp ---- a/mailnews/compose/src/nsMsgCompUtils.cpp -+++ b/mailnews/compose/src/nsMsgCompUtils.cpp -@@ -364,36 +364,42 @@ mime_generate_headers (nsMsgCompFields * - if (deliver_mode == MSG_SaveAsTemplate) { - const char *pStr = fields->GetTemplateName(); - pStr = pStr ? pStr : ""; - ENCODE_AND_PUSH("X-Template: ", false, pStr, charset, usemime); - } - #endif /* SUPPORT_X_TEMPLATE_NAME */ - } - -- PRExplodedTime now; -- PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -- int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; -+ bool local_date_header = true; -+ prefs->GetBoolPref("mailnews.local_date_header_generation", &local_date_header); - -- /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -- then figure out what our local GMT offset is, and append it (since -- PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -- per RFC 1123 (superceding RFC 822.) -- */ -- PR_FormatTimeUSEnglish(buffer_tail, 100, -- "Date: %a, %d %b %Y %H:%M:%S ", -- &now); -+ if (local_date_header) -+ { -+ PRExplodedTime now; -+ PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -+ int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; - -- buffer_tail += PL_strlen (buffer_tail); -- PR_snprintf(buffer_tail, buffer + size - buffer_tail, -- "%c%02d%02d" CRLF, -- (gmtoffset >= 0 ? '+' : '-'), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -- buffer_tail += PL_strlen (buffer_tail); -+ /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -+ then figure out what our local GMT offset is, and append it (since -+ PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -+ per RFC 1123 (superceding RFC 822.) -+ */ -+ PR_FormatTimeUSEnglish(buffer_tail, 100, -+ "Date: %a, %d %b %Y %H:%M:%S ", -+ &now); -+ -+ buffer_tail += PL_strlen (buffer_tail); -+ PR_snprintf(buffer_tail, buffer + size - buffer_tail, -+ "%c%02d%02d" CRLF, -+ (gmtoffset >= 0 ? '+' : '-'), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -+ buffer_tail += PL_strlen (buffer_tail); -+ } - - if (pFrom && *pFrom) - { - ENCODE_AND_PUSH("From: ", true, pFrom, charset, usemime); - } - - if (pReplyTo && *pReplyTo) - { diff --git a/patches/mailnewspref.patch b/patches/mailnewspref.patch deleted file mode 100644 index 6bffc79..0000000 --- a/patches/mailnewspref.patch +++ /dev/null @@ -1,26 +0,0 @@ -# HG changeset patch -# Parent 721cec51e68558ab41a21d7f3db1b7de0e20f3bd -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Set the default preferences for the patches (https://bugzilla.mozilla.org/show_bug.cgi?id=776397) - - -diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js ---- a/mailnews/mailnews.js -+++ b/mailnews/mailnews.js -@@ -814,8 +814,16 @@ pref("mail.smtp.qos", 0); - pref("mail.nntp.qos", 0); - - // default value for IMAP4 - // in a DSCP environment this should be 56 (0x38, or AF13), ibid. - pref("mail.imap.qos", 0); - - // PgpMime Addon - pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/"); -+ -+// Send emails with the Date header. -+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409). -+pref("mailnews.local_date_header_generation", true); -+ -+// Allow a custom message-ID to be set through an extension. -+pref("mailnews.custom_message_id", false); -+pref("mailnews.header.custom_message_id", ""); diff --git a/patches/messageid.patch b/patches/messageid.patch deleted file mode 100644 index 1cbebc8..0000000 --- a/patches/messageid.patch +++ /dev/null @@ -1,49 +0,0 @@ -# HG changeset patch -# Parent 433268decbc634fd8855bdc114a9356dfec431dd -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Added support for setting a custom message-ID - - -diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp ---- a/mailnews/compose/src/nsMsgCompUtils.cpp -+++ b/mailnews/compose/src/nsMsgCompUtils.cpp -@@ -1109,19 +1109,36 @@ msg_generate_message_id (nsIMsgIdentity - ++host; - } - - if (!isValidHost(host)) - /* If we couldn't find a valid host name to use, we can't generate a - valid message ID, so bail, and let NNTP and SMTP generate them. */ - return 0; - -- GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -- return PR_smprintf("<%lX.%lX@%s>", -- (unsigned long) now, (unsigned long) salt, host); -+ bool custom_message_id = false; -+ nsCString message_id; -+ -+ nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); -+ if (NS_SUCCEEDED(rv)) { -+ prefs->GetBoolPref("mailnews.custom_message_id", &custom_message_id); -+ prefs->GetCharPref("mailnews.header.custom_message_id", getter_Copies(message_id)); -+ } -+ -+ if (!custom_message_id) -+ { -+ GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -+ return PR_smprintf("<%lX.%lX@%s>", -+ (unsigned long) now, (unsigned long) salt, host); -+ } -+ else -+ { -+ return PR_smprintf("<%s@%s>", -+ message_id.get(), host); -+ } - } - - - inline static bool is7bitCharset(const nsCString& charset) - { - // charset name is canonical (no worry about case-sensitivity) - return charset.EqualsLiteral("HZ-GB-2312") || - Substring(charset, 0, 8).EqualsLiteral("ISO-2022-"); diff --git a/patches/unified.patch b/patches/unified.patch deleted file mode 100644 index 0aa1120..0000000 --- a/patches/unified.patch +++ /dev/null @@ -1,130 +0,0 @@ -# HG changeset patch -# Parent a9d426e01d37d2a72fcfeb8cd63242982d04adb2 -# User Sukhbir Singh <sukhbir.in(a)gmail.com> -Prevent local timestamp disclosure via Date and Message-ID header fields. - - -diff --git a/mailnews/compose/src/nsMsgCompUtils.cpp b/mailnews/compose/src/nsMsgCompUtils.cpp ---- a/mailnews/compose/src/nsMsgCompUtils.cpp -+++ b/mailnews/compose/src/nsMsgCompUtils.cpp -@@ -364,36 +364,42 @@ mime_generate_headers (nsMsgCompFields * - if (deliver_mode == MSG_SaveAsTemplate) { - const char *pStr = fields->GetTemplateName(); - pStr = pStr ? pStr : ""; - ENCODE_AND_PUSH("X-Template: ", false, pStr, charset, usemime); - } - #endif /* SUPPORT_X_TEMPLATE_NAME */ - } - -- PRExplodedTime now; -- PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -- int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; -+ bool local_date_header = true; -+ prefs->GetBoolPref("mailnews.local_date_header_generation", &local_date_header); - -- /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -- then figure out what our local GMT offset is, and append it (since -- PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -- per RFC 1123 (superceding RFC 822.) -- */ -- PR_FormatTimeUSEnglish(buffer_tail, 100, -- "Date: %a, %d %b %Y %H:%M:%S ", -- &now); -+ if (local_date_header) -+ { -+ PRExplodedTime now; -+ PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now); -+ int gmtoffset = (now.tm_params.tp_gmt_offset + now.tm_params.tp_dst_offset) / 60; - -- buffer_tail += PL_strlen (buffer_tail); -- PR_snprintf(buffer_tail, buffer + size - buffer_tail, -- "%c%02d%02d" CRLF, -- (gmtoffset >= 0 ? '+' : '-'), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -- ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -- buffer_tail += PL_strlen (buffer_tail); -+ /* Use PR_FormatTimeUSEnglish() to format the date in US English format, -+ then figure out what our local GMT offset is, and append it (since -+ PR_FormatTimeUSEnglish() can't do that.) Generate four digit years as -+ per RFC 1123 (superceding RFC 822.) -+ */ -+ PR_FormatTimeUSEnglish(buffer_tail, 100, -+ "Date: %a, %d %b %Y %H:%M:%S ", -+ &now); -+ -+ buffer_tail += PL_strlen (buffer_tail); -+ PR_snprintf(buffer_tail, buffer + size - buffer_tail, -+ "%c%02d%02d" CRLF, -+ (gmtoffset >= 0 ? '+' : '-'), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) / 60), -+ ((gmtoffset >= 0 ? gmtoffset : -gmtoffset) % 60)); -+ buffer_tail += PL_strlen (buffer_tail); -+ } - - if (pFrom && *pFrom) - { - ENCODE_AND_PUSH("From: ", true, pFrom, charset, usemime); - } - - if (pReplyTo && *pReplyTo) - { -@@ -1109,19 +1115,36 @@ msg_generate_message_id (nsIMsgIdentity - ++host; - } - - if (!isValidHost(host)) - /* If we couldn't find a valid host name to use, we can't generate a - valid message ID, so bail, and let NNTP and SMTP generate them. */ - return 0; - -- GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -- return PR_smprintf("<%lX.%lX@%s>", -- (unsigned long) now, (unsigned long) salt, host); -+ bool custom_message_id = false; -+ nsCString message_id; -+ -+ nsCOMPtr<nsIPrefBranch> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv)); -+ if (NS_SUCCEEDED(rv)) { -+ prefs->GetBoolPref("mailnews.custom_message_id", &custom_message_id); -+ prefs->GetCharPref("mailnews.header.custom_message_id", getter_Copies(message_id)); -+ } -+ -+ if (!custom_message_id) -+ { -+ GenerateGlobalRandomBytes((unsigned char *) &salt, sizeof(salt)); -+ return PR_smprintf("<%lX.%lX@%s>", -+ (unsigned long) now, (unsigned long) salt, host); -+ } -+ else -+ { -+ return PR_smprintf("<%s@%s>", -+ message_id.get(), host); -+ } - } - - - inline static bool is7bitCharset(const nsCString& charset) - { - // charset name is canonical (no worry about case-sensitivity) - return charset.EqualsLiteral("HZ-GB-2312") || - Substring(charset, 0, 8).EqualsLiteral("ISO-2022-"); -diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js ---- a/mailnews/mailnews.js -+++ b/mailnews/mailnews.js -@@ -821,8 +821,16 @@ pref("mail.smtp.qos", 0); - pref("mail.nntp.qos", 0); - - // default value for IMAP4 - // in a DSCP environment this should be 56 (0x38, or AF13), ibid. - pref("mail.imap.qos", 0); - - // PgpMime Addon - pref("mail.pgpmime.addon_url", "https://addons.mozilla.org/addon/enigmail/"); -+ -+// Send emails with the Date header. -+// If set to false, the Date header will be inserted by the MSA (RFC 4409/RFC 6409). -+pref("mailnews.local_date_header_generation", true); -+ -+// Allow a custom message-ID to be set through an extension. -+pref("mailnews.custom_message_id", false); -+pref("mailnews.header.custom_message_id", "");

1 0

[torbirdy/develop] Remove redundant security settings
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 776e7cb2700c7cc5f2416ff1036684ea7e605665 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 19 09:23:12 2016 -0400 Remove redundant security settings We have supported servers that do not support secure renegotiation but that was a long time ago when some servers didn't support it. This setting should no longer be required. --- chrome/content/preferences.js | 19 +------------------ chrome/content/preferences.xul | 10 ---------- chrome/locale/en/torbirdy.dtd | 3 --- 3 files changed, 1 insertion(+), 31 deletions(-) diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index f1bf091..682b367 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -45,6 +45,7 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { if (anonService === "jondo") { proxy = "http://127.0.0.1:4001"; } + return opts + "--no-emit-version " + "--no-comments " + @@ -363,18 +364,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.prefs.setBoolPref(pub.prefBranch + 'emailwizard', false); } - // Insecure renegotiation - default: false (opt-out for mailservers that do - // not support secure renegotiation yet) - var securityRenegotiation = 'security.ssl.require_safe_negotiation'; - var securityWarn = 'security.ssl.treat_unsafe_negotiation_as_broken'; - if (pub.secureRenegotiation.checked) { - pub.setPreferences(securityRenegotiation, false); - pub.setPreferences(securityWarn, false); - } else { - pub.clearSinglePref(securityRenegotiation); - pub.clearSinglePref(securityWarn); - } - if (index === 1) { // JonDo. if (pub.anonCustomService.selectedIndex === 0) { @@ -535,12 +524,6 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { /* Security */ - // Allow insecure renegotiation - default: false - if (pub.prefs.prefHasUserValue(pub.customBranch + 'security.ssl.require_safe_negotiation')) { - pub.secureRenegotiation.checked = true; - } else { - pub.secureRenegotiation.checked = false; - } // Load the email accounts. var accounts = pub.getAccount(); diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul index 2526f4d..8db7230 100644 --- a/chrome/content/preferences.xul +++ b/chrome/content/preferences.xul @@ -28,7 +28,6 @@ <tab label="&torbirdy.prefs.proxy.label;"/> <tab label="&torbirdy.prefs.privacy.label;"/> <tab label="&torbirdy.prefs.enigmail.label;"/> - <tab label="&torbirdy.prefs.security.label;"/> </tabs> <tabpanels> @@ -148,15 +147,6 @@ </tabpanel>  - <tabpanel> - <vbox> - - <vbox> - <checkbox accesskey="&torbirdy.prefs.renegotiation.key;" id="torbirdy-renegotiation" label="&torbirdy.prefs.renegotiation.label;"/> - </vbox> - - </vbox> - </tabpanel> </tabpanels> diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index d670135..26d357e 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -19,7 +19,6 @@ <!ENTITY torbirdy.prefs.proxy.label "Proxy"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> -<!ENTITY torbirdy.prefs.security.label "Security"> <!ENTITY torbirdy.prefs.recommended.text "Use the recommended proxy settings for TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Choose an anonymization service"> @@ -45,8 +44,6 @@ <!ENTITY torbirdy.prefs.emailwizard.key "w"> <!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]"> <!ENTITY torbirdy.prefs.automatic.key "f"> -<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]"> -<!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "Account-Specific"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Choose an account: ">

1 0

[torbirdy/develop] Global let/const are no longer properties (bugzilla #1209777)
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 31de9e4937791467752bc071104e9363a41735c2 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon May 16 14:57:29 2016 -0400 Global let/const are no longer properties (bugzilla #1209777) --- chrome/content/composeoverlay.js | 4 ++-- components/torbirdy.js | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/chrome/content/composeoverlay.js b/chrome/content/composeoverlay.js index 25402b3..843cfbc 100644 --- a/chrome/content/composeoverlay.js +++ b/chrome/content/composeoverlay.js @@ -1,5 +1,5 @@ -const Ci = Components.interfaces; -const Cc = Components.classes; +var Ci = Components.interfaces; +var Cc = Components.classes; function torbirdyTextRandom() { // Generate alphanumeric random numbers. diff --git a/components/torbirdy.js b/components/torbirdy.js index 5e8e9ca..ead2508 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -1,18 +1,18 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/AddonManager.jsm"); -const Ci = Components.interfaces; -const Cc = Components.classes; -const Cr = Components.results; +var Ci = Components.interfaces; +var Cc = Components.classes; +var Cr = Components.results; -const SERVICE_CTRID = "@torproject.org/torbirdy;1"; -const SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); -const SERVICE_NAME = "Main TorBirdy Component"; -const TB_ID = "castironthunderbirdclub(a)torproject.org"; +var SERVICE_CTRID = "@torproject.org/torbirdy;1"; +var SERVICE_ID = Components.ID("{ebd85413-18c8-4265-a708-a8890ec8d1ed}"); +var SERVICE_NAME = "Main TorBirdy Component"; +var TB_ID = "castironthunderbirdclub(a)torproject.org"; -const kPrefBranch = "extensions.torbirdy.custom."; -const kRestoreBranch = "extensions.torbirdy.restore."; -const kTorBirdyBranch = "extensions.torbirdy."; +var kPrefBranch = "extensions.torbirdy.custom."; +var kRestoreBranch = "extensions.torbirdy.restore."; +var kTorBirdyBranch = "extensions.torbirdy."; // Default preference values for TorBirdy. // These preferences values will be "enforced": even if the user decides to @@ -23,7 +23,7 @@ const kTorBirdyBranch = "extensions.torbirdy."; // the secure default when Thunderbird starts. // There are some preferences that can be overwritten using TorBirdy's // preferences dialog. See `preferences.js'. -const TorBirdyPrefs = { +var TorBirdyPrefs = { "extensions.torbirdy.protected": false, // When the preferences below have been set, enable TorBirdy. @@ -211,7 +211,6 @@ const TorBirdyPrefs = { "browser.cache.memory.enable": false, "browser.cache.offline.enable": false, "browser.formfill.enable": false, - "signon.rememberSignons": false, "signon.autofillForms": false, // https://bugs.torproject.org/10367 @@ -675,4 +674,4 @@ TorBirdy.prototype = { } -const NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]); +var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]);

1 0

[torbirdy/develop] Prevent third-party images from loading
by sukhbir＠torproject.org 25 Nov '16

25 Nov '16

commit 7b5fd8c94ebdf81b6d0e8893a75aa64d48e4cf53 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu May 19 09:39:12 2016 -0400 Prevent third-party images from loading In theory we can allow all images but in the context of Thunderbird, blocking third-party images should be fine. Earlier we were blocking all images but that isn't really required. --- components/torbirdy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index eb64df6..a113323 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -352,7 +352,7 @@ var TorBirdyPrefs = { "gfx.downloadable_fonts.enabled": false, // Disable remote images. - "permissions.default.image": 2, + "permissions.default.image": 3, /* Finish

1 0