[tor-commits] [tor-messenger-build/esr52] Disable SRV lookups that use the system DNS library
sukhbir at torproject.org
sukhbir at torproject.org
Sat Sep 2 01:42:08 UTC 2017
commit d47648c8a55ad5d2419827aff7461688cc026c41
Author: Arlo Breault <arlolra at gmail.com>
Date: Tue Aug 29 22:23:26 2017 -0400
Disable SRV lookups that use the system DNS library
* From bugzilla 787369
---
.../0001-Set-Tor-Messenger-preferences.patch | 33 ++++++++++++----------
...c-21634-Autologin-default-should-be-false.patch | 2 +-
.../0003-XMPP-in-band-registration.patch | 2 +-
.../instantbird/0004-Remove-search-from-UI.patch | 2 +-
.../0005-Add-Tor-Messenger-branding.patch | 2 +-
...ve-option-for-configuring-account-picture.patch | 2 +-
.../0007-Modify-top-protocol-defaults.patch | 2 +-
.../instantbird/0008-Modify-IRC-defaults.patch | 2 +-
.../0009-Do-not-set-default-XMPP-server.patch | 2 +-
projects/instantbird/0010-Modify-themes.patch | 2 +-
projects/instantbird/0011-Remove-logging-UI.patch | 2 +-
projects/instantbird/0012-Cert-override.patch | 2 +-
.../0013-Display-all-traffic-over-Tor.patch | 2 +-
.../instantbird/0014-Trac-17480-Content-sink.patch | 2 +-
.../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +-
...-Use-built-in-functions-instead-of-an-svg.patch | 2 +-
...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +-
...517-Use-different-color-for-Add-Exception.patch | 2 +-
...21736-Hide-account-timestamp-from-message.patch | 6 ++--
...wed-duplicated-files-for-Windows-and-Linu.patch | 2 +-
...g-13855-Use-known-onions-for-XMPP-servers.patch | 2 +-
.../0022-Bug-16606-Automatic-XMPP-accounts.patch | 2 +-
22 files changed, 41 insertions(+), 38 deletions(-)
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index f1ec406..d215552 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,17 +1,17 @@
-From 44eadb31b5f73252cf991328b014b9cb64bde155 Mon Sep 17 00:00:00 2001
+From 3aef7c8034e706afa8f0b3e31ecd03c8f9017ab4 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Wed, 26 Jul 2017 14:30:41 -0400
Subject: [PATCH 01/22] Set Tor Messenger preferences
---
- im/app/profile/all-instantbird.js | 455 ++++++++++++++++++++++++++++++++++++--
- 1 file changed, 431 insertions(+), 24 deletions(-)
+ im/app/profile/all-instantbird.js | 458 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 434 insertions(+), 24 deletions(-)
diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js
-index 127c86a662..fd95a1e6b1 100644
+index 127c86a662..31b3744c63 100644
--- a/im/app/profile/all-instantbird.js
+++ b/im/app/profile/all-instantbird.js
-@@ -1,3 +1,53 @@
+@@ -1,3 +1,56 @@
+/**
+ * This file is divided into three section,
+ *
@@ -53,6 +53,9 @@ index 127c86a662..fd95a1e6b1 100644
+// Disable JavaScript in browser requests
+pref("chat.browserRequest.disableJavascript", true);
+
++// Whether to disable SRV lookups that use the system DNS library.
++pref("chat.dns.srv.disable", true);
++
+// No AUS check for system add-on updates for Tor Browser users.
+// This pref is taken from the TB diff of browser/app/profile/firefox.js
+pref("extensions.systemAddon.update.url", "");
@@ -65,7 +68,7 @@ index 127c86a662..fd95a1e6b1 100644
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-@@ -28,7 +78,7 @@ pref("general.autoScroll", true);
+@@ -28,7 +81,7 @@ pref("general.autoScroll", true);
// 0 = spellcheck nothing
// 1 = check multi-line controls [default]
// 2 = check multi/single line controls
@@ -74,7 +77,7 @@ index 127c86a662..fd95a1e6b1 100644
pref("messenger.accounts.convertOldPasswords", true);
pref("messenger.accounts.promptOnDelete", true);
-@@ -66,7 +116,7 @@ pref("extensions.mintrayr.singleClickRestore", false);
+@@ -66,7 +119,7 @@ pref("extensions.mintrayr.singleClickRestore", false);
// Whether message related sounds should be played at all. If this is enabled
// then the more specific prefs are checked as well.
@@ -83,7 +86,7 @@ index 127c86a662..fd95a1e6b1 100644
// Specifies whether each message event should trigger a sound for incoming
// and outgoing messages, or when your nickname is mentioned in a chat.
pref("messenger.options.playSounds.outgoing", true);
-@@ -142,26 +192,23 @@ pref("app.update.staging.enabled", true);
+@@ -142,26 +195,23 @@ pref("app.update.staging.enabled", true);
// Update service URL:
// You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example
@@ -115,7 +118,7 @@ index 127c86a662..fd95a1e6b1 100644
// Interval: Time before prompting the user to restart to install the latest
// download (in seconds) default=30 minutes
-@@ -195,7 +242,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio
+@@ -195,7 +245,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio
pref("browser.search.order.2", "chrome://instantbird/locale/region.properties");
// send ping to the server to update
@@ -124,7 +127,7 @@ index 127c86a662..fd95a1e6b1 100644
// disable logging for the search service update system by default
pref("browser.search.update.log", false);
-@@ -220,8 +267,8 @@ pref("services.kinto.update_enabled", false);
+@@ -220,8 +270,8 @@ pref("services.kinto.update_enabled", false);
// Block insecure active content on https pages
pref("security.mixed_content.block_active_content", true);
@@ -135,7 +138,7 @@ index 127c86a662..fd95a1e6b1 100644
/* Extension manager */
pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
-@@ -235,10 +282,10 @@ pref("extensions.ignoreMTimeChanges", false);
+@@ -235,10 +285,10 @@ pref("extensions.ignoreMTimeChanges", false);
pref("extensions.logging.enabled", false);
pref("general.skins.selectedSkin", "classic/1.0");
@@ -148,7 +151,7 @@ index 127c86a662..fd95a1e6b1 100644
// Preferences for the Get Add-ons pane
pref("extensions.getAddons.cache.enabled", false);
-@@ -265,16 +312,16 @@ pref("plugins.click_to_play", false);
+@@ -265,16 +315,16 @@ pref("plugins.click_to_play", false);
pref("plugin.default.state", 0);
// Plugins bundled in XPIs are enabled by default.
@@ -169,7 +172,7 @@ index 127c86a662..fd95a1e6b1 100644
// don't load links inside Instantbird
pref("network.protocol-handler.expose-all", false);
-@@ -286,13 +333,13 @@ pref("network.protocol-handler.expose.https", true);
+@@ -286,13 +336,13 @@ pref("network.protocol-handler.expose.https", true);
// expose javascript: so that message themes can use it.
// javascript: links inside messages are filtered out.
@@ -186,7 +189,7 @@ index 127c86a662..fd95a1e6b1 100644
// We have an Error Console menu item by default so let's display chrome errors
pref("javascript.options.showInConsole", true);
-@@ -327,7 +374,7 @@ pref("browser.tabs.tabClipWidth", 140);
+@@ -327,7 +377,7 @@ pref("browser.tabs.tabClipWidth", 140);
// 3 at the end of the tabstrip
pref("browser.tabs.closeButtons", 1);
@@ -195,7 +198,7 @@ index 127c86a662..fd95a1e6b1 100644
pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw");
pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU");
-@@ -337,4 +384,364 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU
+@@ -337,4 +387,364 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU
pref("chat.prpls.forcePurple", "");
// Whether to parse log files for conversation statistics.
diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch
index 8594e83..8d06c52 100644
--- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch
+++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch
@@ -1,4 +1,4 @@
-From eeef298b165b6c91bcb7da7c288d332e1805e823 Mon Sep 17 00:00:00 2001
+From ab5dabcf6221b83733482587c6ccdb3975b30b46 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Mon, 16 Nov 2015 20:37:53 -0800
Subject: [PATCH 02/22] Trac 21634: Autologin default should be false
diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch
index 2819f5e..5b1fd6d 100644
--- a/projects/instantbird/0003-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0003-XMPP-in-band-registration.patch
@@ -1,4 +1,4 @@
-From c67cae1deee24e2b440c967d720d033e176e5b8d Mon Sep 17 00:00:00 2001
+From 313ff42077e8a6aa6ca8acf9a659d991af64bdc3 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Wed, 26 Jul 2017 15:09:40 -0400
Subject: [PATCH 03/22] XMPP in-band registration
diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch
index ac73869..3459d6c 100644
--- a/projects/instantbird/0004-Remove-search-from-UI.patch
+++ b/projects/instantbird/0004-Remove-search-from-UI.patch
@@ -1,4 +1,4 @@
-From 8f329c1df365a64ecce561b0c4a46d7c683e7a1d Mon Sep 17 00:00:00 2001
+From 5b47b35c62fe57b4e37b75efd9e116d6995c0b88 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 18:47:48 -0700
Subject: [PATCH 04/22] Remove search from UI
diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch
index df7bb63..85aca2d 100644
--- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch
@@ -1,4 +1,4 @@
-From ec0c0fdf2242795ec29678476a14498e9e7251c3 Mon Sep 17 00:00:00 2001
+From 38fa4bd0401bc9dbcba80a7fb1d51456dae0e3b1 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Wed, 26 Jul 2017 15:46:51 -0400
Subject: [PATCH 05/22] Add Tor Messenger branding
diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch
index 737f6ed..b69798e 100644
--- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch
+++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch
@@ -1,4 +1,4 @@
-From ef2d5cf0c6c44393e80d968491d6f62840ca803e Mon Sep 17 00:00:00 2001
+From ca63ac2fee5d1cd4c07385c27951336ca044e0f1 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:24:09 -0700
Subject: [PATCH 06/22] Remove option for configuring account picture
diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch
index 584a267..465f994 100644
--- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch
+++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch
@@ -1,4 +1,4 @@
-From a3ebacee503fb025e13110a5838645f3f9b250c9 Mon Sep 17 00:00:00 2001
+From 4273f5eaed18c4454e2e44abcf65934e2c36b403 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Wed, 26 Jul 2017 16:16:09 -0400
Subject: [PATCH 07/22] Modify top protocol defaults
diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch
index b0e28aa..d484fce 100644
--- a/projects/instantbird/0008-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0008-Modify-IRC-defaults.patch
@@ -1,4 +1,4 @@
-From 47fb77f57e3ab7dea49d6a8061873e2125117dde Mon Sep 17 00:00:00 2001
+From 8c5a1d78d4fa63299a11683de8c722dd684925dd Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:31:58 -0700
Subject: [PATCH 08/22] Modify IRC defaults
diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch
index 3b9e94e..53519ec 100644
--- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch
+++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch
@@ -1,4 +1,4 @@
-From d6131e4b0851b15a5adfd89177eb772de73ee958 Mon Sep 17 00:00:00 2001
+From f9e325df59a312e311fa8427db4c8970e1ea827d Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Fri, 28 Jul 2017 12:11:57 -0400
Subject: [PATCH 09/22] Do not set default XMPP server
diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch
index b840e86..0611c04 100644
--- a/projects/instantbird/0010-Modify-themes.patch
+++ b/projects/instantbird/0010-Modify-themes.patch
@@ -1,4 +1,4 @@
-From 3206bed9480c826f7c70ba4804076248959772ad Mon Sep 17 00:00:00 2001
+From 794e18ff85d131302db91c92f99e36e11af89f51 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:36:38 -0700
Subject: [PATCH 10/22] Modify themes
diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch
index 78c03c8..10356d8 100644
--- a/projects/instantbird/0011-Remove-logging-UI.patch
+++ b/projects/instantbird/0011-Remove-logging-UI.patch
@@ -1,4 +1,4 @@
-From af3bcdcb928902e44f28e872ed7ed1eeea4f4a7d Mon Sep 17 00:00:00 2001
+From 1e98d5b631fef9d8d1c37589293938c2b10c7a4f Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:50:48 -0700
Subject: [PATCH 11/22] Remove logging UI
diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch
index f4879f1..8544009 100644
--- a/projects/instantbird/0012-Cert-override.patch
+++ b/projects/instantbird/0012-Cert-override.patch
@@ -1,4 +1,4 @@
-From 4acec30f0d25ad8c3661ab279748336ef230a7a2 Mon Sep 17 00:00:00 2001
+From 333dd2f6557312497902f5b2796c212503be7c8f Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:56:46 -0700
Subject: [PATCH 12/22] Cert override
diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch
index b11ecf4..8692956 100644
--- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch
@@ -1,4 +1,4 @@
-From 73321adb92aa81f60de281208634d5a62566428b Mon Sep 17 00:00:00 2001
+From 33bcbd47beeeb7b0d96d5ed7148c528c98b7e2cb Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 10 Oct 2016 19:58:31 -0700
Subject: [PATCH 13/22] Display all traffic over Tor
diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch
index 41c2309..97a78e7 100644
--- a/projects/instantbird/0014-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch
@@ -1,4 +1,4 @@
-From a5c9e85e965f28e05997dbddac9c84903ada9cb4 Mon Sep 17 00:00:00 2001
+From d0ffa62609bb4c275e3a3a68ed40d79f936c4a7d Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Wed, 5 Oct 2016 11:09:25 -0700
Subject: [PATCH 14/22] Trac 17480: Content sink
diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch
index cf9f76e..818b868 100644
--- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,4 +1,4 @@
-From a83c92268dbd0959427525d85245de8364c3b120 Mon Sep 17 00:00:00 2001
+From e19c3cf5b7f56e19a1c6ed144192b3cb12f198d6 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 2 Oct 2016 08:46:55 -0700
Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE
diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
index 8bf5458..5356662 100644
--- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
+++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
@@ -1,4 +1,4 @@
-From 563a445eccd41b832f43cfe3465785870591528e Mon Sep 17 00:00:00 2001
+From a9bb56bdb91d98709d66036b09bb39ad05436651 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Tue, 29 Aug 2017 14:45:29 -0400
Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg
diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
index f107bb8..25d50ab 100644
--- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
+++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
@@ -1,4 +1,4 @@
-From bcc668d8a25bce408c9e908975891f21447cd8ea Mon Sep 17 00:00:00 2001
+From 9dc6ee85b96d16d159a5132e1e6ed1b94b068824 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Wed, 26 Jul 2017 16:35:33 -0400
Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in
diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch
index 5ce547d..b58c717 100644
--- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch
+++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch
@@ -1,4 +1,4 @@
-From e27529ddb8f28889416f6ec829d4f13c05ec1b53 Mon Sep 17 00:00:00 2001
+From 08785730b9ccc353900cc8807b4b2cd5ae348337 Mon Sep 17 00:00:00 2001
From: Vu Quoc Huy <huyvq.c633 at gmail.com>
Date: Wed, 26 Jul 2017 16:38:19 -0400
Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception
diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch
index 0d636c8..a2facae 100644
--- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch
+++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch
@@ -1,4 +1,4 @@
-From 7f60ba9eca14bd39eefa3fb732fd0f2db83b2ff6 Mon Sep 17 00:00:00 2001
+From a2a8f798d2a6464d89da8f566cfeb6343ff1eee8 Mon Sep 17 00:00:00 2001
From: Vu Quoc Huy <huyvq.c633 at gmail.com>
Date: Sun, 2 Apr 2017 13:07:09 -0400
Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message
@@ -44,10 +44,10 @@ index a723d742bf..95d917f0d7 100644
}
diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js
-index fd95a1e6b1..fbc540bc5e 100644
+index 31b3744c63..98e1a7b929 100644
--- a/im/app/profile/all-instantbird.js
+++ b/im/app/profile/all-instantbird.js
-@@ -47,6 +47,11 @@ pref("extensions.systemAddon.update.url", "");
+@@ -50,6 +50,11 @@ pref("extensions.systemAddon.update.url", "");
// background (in seconds)
pref("app.update.download.backgroundInterval", 60);
diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch
index ca1d7a9..121d034 100644
--- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch
+++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch
@@ -1,4 +1,4 @@
-From eaf813e223ec20118a82ed81f08598cfaf7a81ef Mon Sep 17 00:00:00 2001
+From 89f693b09d1c8238e38351b430e31942919732cc Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Thu, 27 Jul 2017 15:16:54 -0400
Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux
diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch
index 3425782..516b29b 100644
--- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch
+++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch
@@ -1,4 +1,4 @@
-From ce9b1c114e07ca2e2633d01cb68e96f9e9423263 Mon Sep 17 00:00:00 2001
+From 0fe0d83b49d2f05f2e4d7952c2c7ee9b8fadd058 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Tue, 15 Aug 2017 16:40:33 -0400
Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers
diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch
index 4d81dbe..7e2dc00 100644
--- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch
+++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch
@@ -1,4 +1,4 @@
-From e64cd7dfd68993fe6734be0a6cd4eb965c3942b4 Mon Sep 17 00:00:00 2001
+From 44fc8b702b71754b1f86e38b0085f784777298d8 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir at torproject.org>
Date: Mon, 21 Aug 2017 23:00:07 -0400
Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts
More information about the tor-commits
mailing list