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

[tor-messenger-build/master] Apply prefs in bugzilla 1262010
by arlo＠torproject.org 01 Dec '16

01 Dec '16

commit 4ea436009ad54145cb0f1b8659d890d12d5c65f8 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Dec 1 14:12:32 2016 -0800 Apply prefs in bugzilla 1262010 * Though these should already be prevented by the trac 16475 patch --- .../0001-Set-Tor-Messenger-preferences.patch | 33 ++++++++++++++++------ ...0002-Trac-16489-Prevent-account-autologin.patch | 2 +- ...Support-Special-Characters-input-prompt-o.patch | 2 +- ...Better-error-reporting-for-failed-outgoin.patch | 2 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +- ...-XMPP-createConversation-should-handle-in.patch | 2 +- ...-Set-_userVCard-own-property-when-downloa.patch | 2 +- .../0009-XMPP-in-band-registration.patch | 2 +- .../instantbird/0010-Remove-search-from-UI.patch | 2 +- .../0011-Add-Tor-Messenger-branding.patch | 2 +- projects/instantbird/0012-Account-picture.patch | 2 +- .../0013-Modify-protocol-defaults.patch | 2 +- .../instantbird/0014-Modify-IRC-defaults.patch | 2 +- projects/instantbird/0015-Modify-themes.patch | 2 +- .../instantbird/0016-Modify-XMPP-defaults.patch | 2 +- projects/instantbird/0017-Remove-logging-UI.patch | 2 +- projects/instantbird/0018-Cert-override.patch | 2 +- .../0019-Display-all-traffic-over-Tor.patch | 2 +- .../instantbird/0020-Trac-17480-Content-sink.patch | 2 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +- ...Contact-list-entries-should-adapt-their-h.patch | 2 +- ...1187281-Only-show-close-button-on-Windows.patch | 2 +- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 2 +- ...-Use-built-in-functions-instead-of-an-svg.patch | 2 +- 26 files changed, 49 insertions(+), 34 deletions(-) diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index a2cdba5..bb9000e 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From f33a13f5e5f2fc0a696f93494e29163c531e53e6 Mon Sep 17 00:00:00 2001 +From 4c3c3738aef40779b8725db2cc8e32474b2e512c Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 Subject: [PATCH 01/26] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 406 +++++++++++++++++++++++++++++++++++--- - 1 file changed, 384 insertions(+), 22 deletions(-) + im/app/profile/all-instantbird.js | 420 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 398 insertions(+), 22 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a397017..1ad0d6b95 100644 +index b7a397017..ff49380b6 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,47 @@ @@ -131,9 +131,24 @@ index b7a397017..1ad0d6b95 100644 // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); -@@ -245,9 +286,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% +@@ -244,10 +285,24 @@ pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOC + pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/"); pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); ++// Click-to-play has not been ported yet, see bug 814168. ++// The default plugin state should be changed to "ask to activate" when this ++// has been done. ++pref("plugins.click_to_play", false); ++// Disable by default. ++pref("plugin.default.state", 0); ++ ++// Plugins bundled in XPIs are enabled by default. ++pref("plugin.defaultXpi.state", 0); ++ ++// Flash and Java disabled by default. ++pref("plugin.state.flash", 0); ++pref("plugin.state.java", 0); ++ // suppress external-load warning for standard browser schemes -pref("network.protocol-handler.warn-external.http", false); -pref("network.protocol-handler.warn-external.https", false); @@ -144,7 +159,7 @@ index b7a397017..1ad0d6b95 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -259,13 +300,13 @@ pref("network.protocol-handler.expose.https", true); +@@ -259,13 +314,13 @@ pref("network.protocol-handler.expose.https", true); // expose javascript: so that message themes can use it. // javascript: links inside messages are filtered out. @@ -161,7 +176,7 @@ index b7a397017..1ad0d6b95 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +341,335 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +355,335 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -367,8 +382,8 @@ index b7a397017..1ad0d6b95 100644 +pref("network.protocol-handler.warn-external.nntp", true); +pref("network.protocol-handler.warn-external.snews", true); +pref("plugin.disable", true); // Disable to search plugins on first start -+pref("plugins.click_to_play", true); -+pref("plugin.state.flash", 1); ++//pref("plugins.click_to_play", true); // TM ++//pref("plugin.state.flash", 1); // TM +pref("plugins.hide_infobar_for_missing_plugin", true); +pref("plugins.hideMissingPluginsNotification", true); +pref("media.peerconnection.enabled", false); // Disable WebRTC interfaces diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index b46aad2..f69ce4c 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From 758ef11f3849bb0ac8009477de16f3ad5f69fcae Mon Sep 17 00:00:00 2001 +From a4ddbd00c0a32d809a2af24f9f2eb3ce9e6734f4 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/26] Trac 16489: Prevent account autologin diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 13c94f1..6eff88d 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,4 +1,4 @@ -From db8cc660b76c6a9f005a31dbb6ab6dc33aa63d09 Mon Sep 17 00:00:00 2001 +From e5f7cc504ec4045209879a43e21e9408f82f759d Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 Subject: [PATCH 03/26] Trac 17896: Support "Special Characters" input prompt diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 9bae3b4..0c9d3fb 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,4 +1,4 @@ -From a9bdb6d653c25a5e43e518a3120398c05cc6cefb Mon Sep 17 00:00:00 2001 +From bd4f023395241318ad8bab0f721fbccccffb8885 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 Subject: [PATCH 04/26] Trac 17494: Better error reporting for failed outgoing diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index b431c18..e586e10 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,4 +1,4 @@ -From 6868f83d3fad91762838192d1e34005b153279ff Mon Sep 17 00:00:00 2001 +From 5996053c815c9872b3ec90eabbdaad69071064fa Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 Subject: [PATCH 05/26] Trac 13312: OTR over Twitter DMs diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index d43de67..c2872f0 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,4 +1,4 @@ -From 3fdd9b978c8174124bbf68d414c448818b838473 Mon Sep 17 00:00:00 2001 +From b9052add0dc1e7fdca9c9be6a86cfee4765fb1cd Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 Subject: [PATCH 06/26] Bug 1218193 - Fix tab strip background colour on OS X. diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 7090f06..3be82c4 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,4 +1,4 @@ -From 27678323a56d55750f2c95babbea05c788aaa3ca Mon Sep 17 00:00:00 2001 +From 50e579c8128762aba5b089dd8efa2581c5647309 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 Subject: [PATCH 07/26] Bug 1246431 - XMPP createConversation should handle diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index 0d542a6..860260e 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,4 +1,4 @@ -From 076859e81b50d9e108349b8f8813755c1394a22e Mon Sep 17 00:00:00 2001 +From ec8291566407e9791f5cbb7a518ba990f8063c97 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 Subject: [PATCH 08/26] Bug 1298574 - Set _userVCard own property when diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index 7568fa6..9df73d4 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 84761e5e917ef65fe5f41f37b1594b1958e0a132 Mon Sep 17 00:00:00 2001 +From a65748c8260e0e9e1d5c5c49460a0f4f932572ec Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 Subject: [PATCH 09/26] XMPP in-band registration diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 8abae5c..6abe85b 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 8afe25c91c32920f508823388384d08a9fffbafe Mon Sep 17 00:00:00 2001 +From 8a782e78164f9bab6992169c94eb63968413437e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 10/26] Remove search from UI diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index c9bd8d1..33da960 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 30825fd3818b8aedbe9657cba44cc19367423178 Mon Sep 17 00:00:00 2001 +From 894cf42051d4df8ef2186072157ea4de664a7215 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 Subject: [PATCH 11/26] Add Tor Messenger branding diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 6e1f94d..d3d4c0b 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,4 +1,4 @@ -From 0e9be1b8cbc5a83deea99e27db548a5ee7f27595 Mon Sep 17 00:00:00 2001 +From a6ed86bacc2304bb23ecfd339aa6a2c39750e704 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 12/26] Account picture diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 5abc1f8..d5b138f 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 347131c4544a45138a92758b7d5e8367a1b88e53 Mon Sep 17 00:00:00 2001 +From 9dffeaa7b684ae17975a79cb05e1c3835999dbb5 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 Subject: [PATCH 13/26] Modify protocol defaults diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 6ab7e0b..2e82d90 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 284337da762e32ea77b46bfa7746468aacc8fb43 Mon Sep 17 00:00:00 2001 +From 17523fa3d2f7860abe3eb6629894a7df9bdc2350 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 14/26] Modify IRC defaults diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index d1028bb..d4a7212 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,4 +1,4 @@ -From 73c0698dbb4858ec7e717c16e12e11838abc50e4 Mon Sep 17 00:00:00 2001 +From 7873271e02abb179a0b1a303a21fffeff515cbc4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 15/26] Modify themes diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index 3e95f90..cfb73bc 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From c3a34e12c701cf4d9181f59fcda39ac63bad886d Mon Sep 17 00:00:00 2001 +From 5f1268c7139217124d8ade00cd9fb1f90da0ab49 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 Subject: [PATCH 16/26] Modify XMPP defaults diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index 40a18cc..fbf2e6f 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From dbc831c825fbbde2bd942a79d5ee85f24e441580 Mon Sep 17 00:00:00 2001 +From 7db01c64bbc4b4bf34316ba1cfcf4c2d13a99035 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 17/26] Remove logging UI diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index ceb7528..7454098 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,4 +1,4 @@ -From fc7f9fc5c8cd7c3dc149d36d491f0e4adfc638c2 Mon Sep 17 00:00:00 2001 +From 7df4822425e825e6bdd8dc225f28e087eec7c5c8 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 18/26] Cert override diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index 6ba8e52..7bafdf9 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From a9f32ef8f285f390ff1b8766a886056676ac57e3 Mon Sep 17 00:00:00 2001 +From 96f480c22c8c4a6002c4bfd563cd444494b56294 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 19/26] Display all traffic over Tor diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 9b33973..5c43728 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From d8f1585096eb0fccc8c749721e38d424eaf82cca Mon Sep 17 00:00:00 2001 +From c88a57576cc3b78c69395d35888662e8de4d2f8e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 20/26] Trac 17480: Content sink diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 6d25e3e..bf0ce9f 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 80e0274c4fb2884c2c10b4c54e0c4a2a8b4feda7 Mon Sep 17 00:00:00 2001 +From 08b1abe3af6bdc0143d82ca671218146147ac09e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 21/26] SASL ECDSA-NIST256P-CHALLENGE diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 388a388..ec5eda8 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,4 +1,4 @@ -From 6650334d6bb7d5fad2c3519141577a359f809181 Mon Sep 17 00:00:00 2001 +From b2a074e0dd2ccf85039846f1722f22af2a86062a Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 22/26] Bug 1313137 - "msg is not defined" error in diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index 2ded572..5433910 100644 --- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,4 +1,4 @@ -From 5b9e4e065607f314bcc2af04e3fbb839e27ea567 Mon Sep 17 00:00:00 2001 +From 146c625d13d61402b879381a5ce372677837dfc8 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 Subject: [PATCH 23/26] Bug 954368 - Contact list entries should adapt their diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch index abd54c8..dbdfe6e 100644 --- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,4 +1,4 @@ -From e8f8d6a0b2eddf4af186f5e87fccf53d3a00ca6a Mon Sep 17 00:00:00 2001 +From f5d793612a6fc1aee9f85347ed92b8358e3730fd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 5 Nov 2016 14:55:20 -0700 Subject: [PATCH 24/26] Bug 1187281 - Only show "close" button on Windows diff --git a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index a806bc4..c8fc880 100644 --- a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,4 +1,4 @@ -From c300ecb9482610b71f0418a8f14afba6b9474923 Mon Sep 17 00:00:00 2001 +From 98df785bcb7e90dc878dcfe70e7c84cec1c69cd3 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep(a)gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 Subject: [PATCH 25/26] Bug 1316000 - Remove old Yahoo! Messenger support. diff --git a/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index 2e9bde6..415903a 100644 --- a/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From 915c02bbdb4032c513c0eeb43b36b56dcc006046 Mon Sep 17 00:00:00 2001 +From 09954cbcf1d6c769e0610718edd41c13183fcc75 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 1 Dec 2016 13:25:42 -0800 Subject: [PATCH 26/26] Bug 1321641 - Use built-in functions instead of an svg

1 0

[sandboxed-tor-browser/master] Rename the gdk loader module file in the assets dir.
by yawning＠torproject.org 01 Dec '16

01 Dec '16

commit f351dd3da5d9fdfad346296b70a3e5aeb5edfac5 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Dec 1 21:56:07 2016 +0000 Rename the gdk loader module file in the assets dir. --- data/loader.cache | 13 ------------- data/loaders.cache | 13 +++++++++++++ .../sandboxed-tor-browser/internal/sandbox/application.go | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/data/loader.cache b/data/loader.cache deleted file mode 100644 index d310e06..0000000 --- a/data/loader.cache +++ /dev/null @@ -1,13 +0,0 @@ -# GdkPixbuf Image Loader Modules file -# Automatically generated file, do not edit -# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.31.1 -# -# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders -# -"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so" -"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL" -"image/png" "" -"png" "" -"\211PNG\r\n\032\n" "" 100 - - diff --git a/data/loaders.cache b/data/loaders.cache new file mode 100644 index 0000000..d310e06 --- /dev/null +++ b/data/loaders.cache @@ -0,0 +1,13 @@ +# GdkPixbuf Image Loader Modules file +# Automatically generated file, do not edit +# Created by gdk-pixbuf-query-loaders from gdk-pixbuf-2.31.1 +# +# LoaderDir = /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders +# +"/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so" +"png" 5 "gdk-pixbuf" "The PNG image format" "LGPL" +"image/png" "" +"png" "" +"\211PNG\r\n\032\n" "" 100 + + diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 1e8696d..f04e572 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -613,7 +613,7 @@ func (h *hugbox) appendRestrictedGtk2() ([]string, string, error) { // GDK doesn't have a nice equivalent to `GTK_PATH`, and instead has // an env var pointing to a `loaders.cache` file. loaderCachePath := filepath.Join(normGdkPath, "loaders.cache") - h.assetFile(loaderCachePath, "loader.cache") + h.assetFile(loaderCachePath, "loaders.cache") h.setenv("GDK_PIXBUF_MODULE_FILE", loaderCachePath) gtkLibs = append(gtkLibs, libPngLoader)

1 0

[tor-messenger-build/master] Disable svg and mathml in content
by arlo＠torproject.org 01 Dec '16

01 Dec '16

commit 612f40e441124281cceeb5b19112c2826d47f7ab Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Dec 1 13:35:54 2016 -0800 Disable svg and mathml in content --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 10 ++-- ...0002-Trac-16489-Prevent-account-autologin.patch | 4 +- ...Support-Special-Characters-input-prompt-o.patch | 4 +- ...Better-error-reporting-for-failed-outgoin.patch | 4 +- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 4 +- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 4 +- ...-XMPP-createConversation-should-handle-in.patch | 4 +- ...-Set-_userVCard-own-property-when-downloa.patch | 4 +- .../0009-XMPP-in-band-registration.patch | 4 +- .../instantbird/0010-Remove-search-from-UI.patch | 4 +- .../0011-Add-Tor-Messenger-branding.patch | 4 +- projects/instantbird/0012-Account-picture.patch | 4 +- .../0013-Modify-protocol-defaults.patch | 4 +- .../instantbird/0014-Modify-IRC-defaults.patch | 4 +- projects/instantbird/0015-Modify-themes.patch | 4 +- .../instantbird/0016-Modify-XMPP-defaults.patch | 4 +- projects/instantbird/0017-Remove-logging-UI.patch | 4 +- projects/instantbird/0018-Cert-override.patch | 4 +- .../0019-Display-all-traffic-over-Tor.patch | 4 +- .../instantbird/0020-Trac-17480-Content-sink.patch | 4 +- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 +- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 4 +- ...Contact-list-entries-should-adapt-their-h.patch | 4 +- ...1187281-Only-show-close-button-on-Windows.patch | 4 +- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 4 +- ...-Use-built-in-functions-instead-of-an-svg.patch | 57 ++++++++++++++++++++++ projects/instantbird/config | 1 + 28 files changed, 112 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e3f64e..8acb5fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Tor Messenger 0.3.0b2 -- * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45 * Update tor-browser to 6.0.7 * Don't allow javascript: links in themes + * Disable svg and mathml in content Tor Messenger 0.3.0b1 -- November 22, 2016 * All Platforms diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 2a75c3b..a2cdba5 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 0df511dda30a868bc85824931ea0c4c56b1fbf03 Mon Sep 17 00:00:00 2001 +From f33a13f5e5f2fc0a696f93494e29163c531e53e6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 -Subject: [PATCH 01/25] Set Tor Messenger preferences +Subject: [PATCH 01/26] Set Tor Messenger preferences --- im/app/profile/all-instantbird.js | 406 +++++++++++++++++++++++++++++++++++--- 1 file changed, 384 insertions(+), 22 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a397017..6fc2c90a7 100644 +index b7a397017..1ad0d6b95 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,47 @@ @@ -406,8 +406,8 @@ index b7a397017..6fc2c90a7 100644 +pref("dom.mozTCPSocket.enabled", false); + +// Security slider -+pref("svg.in-content.enabled", true); -+pref("mathml.disabled", false); ++pref("svg.in-content.enabled", false); // TM ++pref("mathml.disabled", true); // TM +// Until we address at least the linkability concerns in #19417 let's disable +// asmjs. +pref("javascript.options.asmjs", false); diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index f13e124..b46aad2 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,7 +1,7 @@ -From 11b8b6e1d0a75e22558353d6faf07c705e624054 Mon Sep 17 00:00:00 2001 +From 758ef11f3849bb0ac8009477de16f3ad5f69fcae Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 -Subject: [PATCH 02/25] Trac 16489: Prevent account autologin +Subject: [PATCH 02/26] Trac 16489: Prevent account autologin --- chat/components/src/imAccounts.js | 2 +- diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index ddb44bb..13c94f1 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,7 +1,7 @@ -From 7086cb8f65f506ec27767f2a2d03295b3e77b817 Mon Sep 17 00:00:00 2001 +From db8cc660b76c6a9f005a31dbb6ab6dc33aa63d09 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 -Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt +Subject: [PATCH 03/26] Trac 17896: Support "Special Characters" input prompt on OS X * Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index 9178fb3..9bae3b4 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,7 +1,7 @@ -From 00767571b5e29389a54897cbbf28efc3fe96f9ca Mon Sep 17 00:00:00 2001 +From a9bdb6d653c25a5e43e518a3120398c05cc6cefb Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 -Subject: [PATCH 04/25] Trac 17494: Better error reporting for failed outgoing +Subject: [PATCH 04/26] Trac 17494: Better error reporting for failed outgoing messages * Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index c48bc6b..b431c18 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,7 +1,7 @@ -From a9b62bbc374934c2910ce53fb0668659cec4e73b Mon Sep 17 00:00:00 2001 +From 6868f83d3fad91762838192d1e34005b153279ff Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 -Subject: [PATCH 05/25] Trac 13312: OTR over Twitter DMs +Subject: [PATCH 05/26] Trac 13312: OTR over Twitter DMs --- chat/components/src/imConversations.js | 3 +- diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index 26fcaa3..d43de67 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,7 +1,7 @@ -From 8e736ffd5f007847f305bda7dd44fca761e96a6f Mon Sep 17 00:00:00 2001 +From 3fdd9b978c8174124bbf68d414c448818b838473 Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 -Subject: [PATCH 06/25] Bug 1218193 - Fix tab strip background colour on OS X. +Subject: [PATCH 06/26] Bug 1218193 - Fix tab strip background colour on OS X. r=aleth --- diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index 071f916..7090f06 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,7 +1,7 @@ -From f709123309faa68e9b243b63ac548048731db0fd Mon Sep 17 00:00:00 2001 +From 27678323a56d55750f2c95babbea05c788aaa3ca Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 -Subject: [PATCH 07/25] Bug 1246431 - XMPP createConversation should handle +Subject: [PATCH 07/26] Bug 1246431 - XMPP createConversation should handle incoming messages from the server properly. r=aleth --- diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index 789cd5f..0d542a6 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,7 +1,7 @@ -From 9866b6d2ec361d987d6bdc48014427df7139ea6c Mon Sep 17 00:00:00 2001 +From 076859e81b50d9e108349b8f8813755c1394a22e Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 -Subject: [PATCH 08/25] Bug 1298574 - Set _userVCard own property when +Subject: [PATCH 08/26] Bug 1298574 - Set _userVCard own property when downloading vCard fails. r=aleth * This prevents an infinite req / res cycle. diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index bea0077..7568fa6 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,7 +1,7 @@ -From ddb8fa8041c1808676b277cbe405aeb970b466b6 Mon Sep 17 00:00:00 2001 +From 84761e5e917ef65fe5f41f37b1594b1958e0a132 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 -Subject: [PATCH 09/25] XMPP in-band registration +Subject: [PATCH 09/26] XMPP in-band registration --- chat/locales/en-US/xmpp.properties | 5 + diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 4fcde9a..8abae5c 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,7 +1,7 @@ -From b1c97ccedc4099704e06e3c1d676b7af7fe8dba0 Mon Sep 17 00:00:00 2001 +From 8afe25c91c32920f508823388384d08a9fffbafe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 -Subject: [PATCH 10/25] Remove search from UI +Subject: [PATCH 10/26] Remove search from UI --- im/content/nsContextMenu.js | 18 +----------------- diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index f5a2c1a..c9bd8d1 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,7 +1,7 @@ -From 9465dccf0297c300caf410f0e31ae49acbdf6a61 Mon Sep 17 00:00:00 2001 +From 30825fd3818b8aedbe9657cba44cc19367423178 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 -Subject: [PATCH 11/25] Add Tor Messenger branding +Subject: [PATCH 11/26] Add Tor Messenger branding --- im/app/macbuild/Contents/Info.plist.in | 2 +- diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index 3bac128..6e1f94d 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,7 +1,7 @@ -From a8276a289236cd8691b6dece5e4e11d2de7f34b4 Mon Sep 17 00:00:00 2001 +From 0e9be1b8cbc5a83deea99e27db548a5ee7f27595 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 -Subject: [PATCH 12/25] Account picture +Subject: [PATCH 12/26] Account picture --- im/content/blist.xul | 3 +-- diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index e8ad5a3..5abc1f8 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,7 +1,7 @@ -From a10101ffc21977f256ee4ecb7f73af71ab5d7426 Mon Sep 17 00:00:00 2001 +From 347131c4544a45138a92758b7d5e8367a1b88e53 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 -Subject: [PATCH 13/25] Modify protocol defaults +Subject: [PATCH 13/26] Modify protocol defaults * Top protocols diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 92207a1..6ab7e0b 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,7 +1,7 @@ -From aa70417e8646c50aa85598d723acd2099d524a1e Mon Sep 17 00:00:00 2001 +From 284337da762e32ea77b46bfa7746468aacc8fb43 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 -Subject: [PATCH 14/25] Modify IRC defaults +Subject: [PATCH 14/26] Modify IRC defaults * ctcp ping diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index 9111fa7..d1028bb 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,7 +1,7 @@ -From b5c49b925dc1be8f8ae37e1f9f04c28020be7aa6 Mon Sep 17 00:00:00 2001 +From 73c0698dbb4858ec7e717c16e12e11838abc50e4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 -Subject: [PATCH 15/25] Modify themes +Subject: [PATCH 15/26] Modify themes * theme extension updateh diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index 20a960c..3e95f90 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,7 +1,7 @@ -From 655f5e07585e180822e6a5a9d6d80f8cb1c4ab09 Mon Sep 17 00:00:00 2001 +From c3a34e12c701cf4d9181f59fcda39ac63bad886d Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 -Subject: [PATCH 16/25] Modify XMPP defaults +Subject: [PATCH 16/26] Modify XMPP defaults * xmpp-default-domain diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index 6c4504e..40a18cc 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,7 +1,7 @@ -From cafc07fcac360ccd5248a6798dfb7706788fe4fe Mon Sep 17 00:00:00 2001 +From dbc831c825fbbde2bd942a79d5ee85f24e441580 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 -Subject: [PATCH 17/25] Remove logging UI +Subject: [PATCH 17/26] Remove logging UI --- im/content/preferences/privacy.xul | 20 -------------------- diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index c6b033a..ceb7528 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,7 +1,7 @@ -From 20e5243b68e4ed887acee55954affdb33fbac423 Mon Sep 17 00:00:00 2001 +From fc7f9fc5c8cd7c3dc149d36d491f0e4adfc638c2 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 -Subject: [PATCH 18/25] Cert override +Subject: [PATCH 18/26] Cert override --- im/app/profile/cert_override.txt | 3 +++ diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index 90fa7fd..6ba8e52 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,7 +1,7 @@ -From 9def66dc758ccdfb179d47b3b6cce29531a38018 Mon Sep 17 00:00:00 2001 +From a9f32ef8f285f390ff1b8766a886056676ac57e3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 -Subject: [PATCH 19/25] Display all traffic over Tor +Subject: [PATCH 19/26] Display all traffic over Tor --- im/content/accountWizard.xul | 2 ++ diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 7c52152..9b33973 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,7 +1,7 @@ -From 5f45a049d67f31ed6cc753ad539ddb9144ff7ddf Mon Sep 17 00:00:00 2001 +From d8f1585096eb0fccc8c749721e38d424eaf82cca Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 -Subject: [PATCH 20/25] Trac 17480: Content sink +Subject: [PATCH 20/26] Trac 17480: Content sink --- chat/modules/imContentSink.jsm | 33 ++++++--------------------------- diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index dd6a659..6d25e3e 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,7 +1,7 @@ -From 049adcc7cc828fdb3e68467cc8acc57778f2deaf Mon Sep 17 00:00:00 2001 +From 80e0274c4fb2884c2c10b4c54e0c4a2a8b4feda7 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 -Subject: [PATCH 21/25] SASL ECDSA-NIST256P-CHALLENGE +Subject: [PATCH 21/26] SASL ECDSA-NIST256P-CHALLENGE --- chat/components/src/imAccounts.js | 1 + diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index d02fe5a..388a388 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,7 +1,7 @@ -From 1ec3e4cd7e820648086460bfbadc26cf43e7945f Mon Sep 17 00:00:00 2001 +From 6650334d6bb7d5fad2c3519141577a359f809181 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 -Subject: [PATCH 22/25] Bug 1313137 - "msg is not defined" error in +Subject: [PATCH 22/26] Bug 1313137 - "msg is not defined" error in irc.js:changeBuddyNick. r=clokep --HG-- diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index 9c3886a..2ded572 100644 --- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,7 +1,7 @@ -From b7d7b3ed7b73f1b46a6334e3d358bace8228b732 Mon Sep 17 00:00:00 2001 +From 5b9e4e065607f314bcc2af04e3fbb839e27ea567 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 -Subject: [PATCH 23/25] Bug 954368 - Contact list entries should adapt their +Subject: [PATCH 23/26] Bug 954368 - Contact list entries should adapt their height to the actual font size. r=florian --HG-- diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch index 17f631d..abd54c8 100644 --- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,7 +1,7 @@ -From 0331be740d906116cc07dceae0d6163442e4e844 Mon Sep 17 00:00:00 2001 +From e8f8d6a0b2eddf4af186f5e87fccf53d3a00ca6a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 5 Nov 2016 14:55:20 -0700 -Subject: [PATCH 24/25] Bug 1187281 - Only show "close" button on Windows +Subject: [PATCH 24/26] Bug 1187281 - Only show "close" button on Windows --- im/content/accounts.xul | 2 ++ diff --git a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 4ba93ef..a806bc4 100644 --- a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,7 +1,7 @@ -From 81b882c16f8216a889e1d6beb1035d8187a59df7 Mon Sep 17 00:00:00 2001 +From c300ecb9482610b71f0418a8f14afba6b9474923 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep(a)gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 -Subject: [PATCH 25/25] Bug 1316000 - Remove old Yahoo! Messenger support. +Subject: [PATCH 25/26] Bug 1316000 - Remove old Yahoo! Messenger support. r=aleth --- diff --git a/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch new file mode 100644 index 0000000..2e9bde6 --- /dev/null +++ b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -0,0 +1,57 @@ +From 915c02bbdb4032c513c0eeb43b36b56dcc006046 Mon Sep 17 00:00:00 2001 +From: Arlo Breault <arlolra(a)gmail.com> +Date: Thu, 1 Dec 2016 13:25:42 -0800 +Subject: [PATCH 26/26] Bug 1321641 - Use built-in functions instead of an svg + for bubbles filter + +--- + im/themes/jar.mn | 1 - + im/themes/messages/bubbles/bubbles.svg | 10 ---------- + im/themes/messages/bubbles/main.css | 2 +- + 3 files changed, 1 insertion(+), 12 deletions(-) + delete mode 100644 im/themes/messages/bubbles/bubbles.svg + +diff --git a/im/themes/jar.mn b/im/themes/jar.mn +index e422619d4..e39f5dcd8 100644 +--- a/im/themes/jar.mn ++++ b/im/themes/jar.mn +@@ -268,7 +268,6 @@ instantbird.jar: + skin/classic/instantbird/messages/bubbles/Bitmaps/minus.png (messages/bubbles/Bitmaps/minus.png) + skin/classic/instantbird/messages/bubbles/Bitmaps/plus-hover.png (messages/bubbles/Bitmaps/plus-hover.png) + skin/classic/instantbird/messages/bubbles/Bitmaps/plus.png (messages/bubbles/Bitmaps/plus.png) +- skin/classic/instantbird/messages/bubbles/bubbles.svg (messages/bubbles/bubbles.svg) + skin/classic/instantbird/messages/bubbles/Footer.html (messages/bubbles/Footer.html) + skin/classic/instantbird/messages/bubbles/Incoming/Content.html (messages/bubbles/Incoming/Content.html) + skin/classic/instantbird/messages/bubbles/Incoming/Context.html (messages/bubbles/Incoming/Context.html) +diff --git a/im/themes/messages/bubbles/bubbles.svg b/im/themes/messages/bubbles/bubbles.svg +deleted file mode 100644 +index 963521eca..000000000 +--- a/im/themes/messages/bubbles/bubbles.svg ++++ /dev/null +@@ -1,10 +0,0 @@ +-<?xml version="1.0"?> +- +- +-<svg xmlns="http://www.w3.org/2000/svg"> +- <filter id="desaturate"> +- <feColorMatrix type="saturate" values="0.4"/> +- </filter> +-</svg> +diff --git a/im/themes/messages/bubbles/main.css b/im/themes/messages/bubbles/main.css +index 15ba97346..4488c30bb 100644 +--- a/im/themes/messages/bubbles/main.css ++++ b/im/themes/messages/bubbles/main.css +@@ -40,7 +40,7 @@ p { + } + + .bubble.context:not(:hover) { +- filter: url("bubbles.svg#desaturate"); ++ filter: saturate(40%); + } + + .indicator { +-- +2.11.0 + diff --git a/projects/instantbird/config b/projects/instantbird/config index 6c07a69..cc1cdc7 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -87,6 +87,7 @@ input_files: - filename: 0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch - filename: 0024-Bug-1187281-Only-show-close-button-on-Windows.patch - filename: 0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch + - filename: 0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch - filename: mozconfig-common - filename: 'mozconfig-[% c("var/osname") %]' name: mozconfig

1 0

[torspec/master] prop224: Remove username/password intro-layer auth.
by asn＠torproject.org 01 Dec '16

01 Dec '16

commit 2b650b67e4fb0d06e1fb33cf6122ab31a5b39038 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Dec 1 16:14:10 2016 -0500 prop224: Remove username/password intro-layer auth. Authorized clients need a x25519 key to decrypt the descriptor anyway, so having username/password method for the intro-layer authorization is not very helpful, since they will need to remember the x25519 key anyway. Perhaps in the future we can reinstate the username/password method, by having x25519/ed25519 keypairs be generated from the low-entropy username/password pair. --- proposals/224-rend-spec-ng.txt | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 4f05638..0b23fc1 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -60,8 +60,7 @@ Table of contents: 3.3.1. Introduction handshake encryption requirements [INTRO-HANDSHAKE-REQS] 3.3.2. Example encryption handshake: ntor with extra data [NTOR-WITH-EXTRA-DATA] 3.4. Authentication during the introduction phase. [INTRO-AUTH] - 3.4.1. Password-based authentication. - 3.4.2. Ed25519-based authentication. + 3.4.1. Ed25519-based authentication. 4. The rendezvous protocol 4.1. Establishing a rendezvous point [EST_REND_POINT] 4.2. Joining to a rendezvous point [JOIN_REND] @@ -1733,26 +1732,11 @@ Table of contents: 3.4. Authentication during the introduction phase. [INTRO-AUTH] - Hidden services may restrict access only to authorized users. One - mechanism to do so is the credential mechanism, where only users who - know the credential for a hidden service may connect at all. For more - fine-grained conntrol, a hidden service can be configured with - password-based or public-key-based authentication. + Hidden services may restrict access only to authorized users. + One mechanism to do so is the credential mechanism, where only users who + know the credential for a hidden service may connect at all. -3.4.1. Password-based authentication. - - To authenticate with a password, the user must include an extension - field in the encrypted part of the INTRODUCE1 cell with an - EXT_FIELD_TYPE type of [01] and the contents: - - Username [00] Password. - - The username may not include any [00] bytes. The password may. - - On the server side, the password MUST be stored hashed and salted, - ideally with scrypt or something better. - -3.4.2. Ed25519-based authentication. +3.4.1. Ed25519-based authentication. To authenticate with an Ed25519 private key, the user must include an extension field in the encrypted part of the INTRODUCE1 cell with an

1 0

[torspec/master] prop224: Revisit basic client authorization
by asn＠torproject.org 01 Dec '16

01 Dec '16

commit 890779ffec60f067048c4e4a9895ccdd49d183a5 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Dec 1 16:13:50 2016 -0500 prop224: Revisit basic client authorization In the past prop224 used to embed the client authorization key in the subcredential. The problem here is that if we wanted to revoke a client, we would have to change the whole subcredential of the service, which means that we would have to announce it to all clients. This patch makes it so that every client has an x25519 and an ed25519 which are used to perform client authorization. To achieve this on the descriptor level, we change the descriptor format to a double-layer encryption where the first layer protects against entities who don't know the public key of the HS, and the second layer protects against unauthorized clients who don't know the x25519 key. The intro level authorization remains as is and uses ed25519 for authentication. Thanks to special for noticing this issue. Thanks to Nick for sketching out the x25519 descriptor auth scheme. --- proposals/224-rend-spec-ng.txt | 446 +++++++++++++++++++++++++++++++++++------ 1 file changed, 384 insertions(+), 62 deletions(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 680e5bc..4f05638 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -23,6 +23,7 @@ Table of contents: 1.7. In more detail: Keeping crypto keys offline 1.8. In more detail: Encryption Keys And Replay Resistance 1.9. In more detail: A menagerie of keys + 1.9.1. In even more detail: Client authorization [CLIENT-AUTH] 2. Generating and publishing hidden service descriptors [HSDIR] 2.1. Deriving blinded keys and subcredentials [SUBCRED] 2.2. Locating, uploading, and downloading hidden service descriptors @@ -36,9 +37,17 @@ Table of contents: 2.3.1. Client behavior in the absense of shared random values 2.3.2. Hidden services and changing shared random values 2.4. Hidden service descriptors: outer wrapper [DESC-OUTER] - 2.5. Hidden service descriptors: encryption format [ENCRYPTED-DATA] - 2.5.1. Number of introduction points [NUM_INTRO_POINT] - 3. The introduction protocol + 2.5. Hidden service descriptors: encryption format [HS-DESC-ENC] + 2.5.1. First layer of encryption [HS-DESC-FIRST-LAYER] + 2.5.1.1. First layer encryption logic + 2.5.1.2. First layer plaintext format + 2.5.1.3. Client behavior + 2.5.1.4. Obfuscating the number of authorized clients + 2.5.2. Second layer of encryption [HS-DESC-SECOND-LAYER] + 2.5.2.1. Second layer encryption keys + 2.5.2.2. Second layer plaintext format + 2.5.3. Deriving hidden service descriptor encryption keys [HS-DESC-ENCRYPTION-KEYS] + 3. The introduction protocol [INTRO-PROTOCOL] 3.1. Registering an introduction point [REG_INTRO_POINT] 3.1.1. Extensible ESTABLISH_INTRO protocol. [EST_INTRO] 3.1.2. Registering an introduction point on a legacy Tor node [LEGACY_EST_INTRO] @@ -424,34 +433,36 @@ Table of contents: 1.3. In more detail: Access control [IMD:AC] - Access control for a hidden service is imposed at multiple points - through the process above. + Access control for a hidden service is imposed at multiple points through + the process above. Furthermore, there is also the option to impose + additional client authorization access control using pre-shared secrets + exchanged out-of-band between the hidden service and its clients. - In order to download a descriptor, clients must know which blinded - signing key was used to sign it. (See the next section for more info - on key blinding.) This blinded signing key is derived from the - service's public key and, optionally, an additional secret that is - not part of the hidden service's onion address. The public key and - this secret together constitute the service's "credential". + The first stage of access control happens when downloading HS descriptors. + Specifically, in order to download a descriptor, clients must know which + blinded signing key was used to sign it. (See the next section for more info + on key blinding.) - When the secret is in use, the hidden service gains protections - equivalent to the "stealth mode" in previous designs. + To learn the introduction points, clients must decrypt the body of the + hidden service descriptor. To do so, clients must know the _unblinded_ + public key of the service, which makes the descriptor unuseable by entities + without that knowledge (e.g. HSDirs that don't know the onion address). - To learn the introduction points, the clients must decrypt the body - of the hidden service descriptor. The encryption key for these is - derived from the service's credential. + Also, if optional client authorization is enabled, hidden service + descriptors are superencrypted using each authorized user's identity x25519 + key, to further ensure that unauthorized entities cannot decrypt it. In order to make the introduction point send a rendezvous request to the service, the client needs to use the per-introduction-point authentication key found in the hidden service descriptor. - The final level of access control happens at the server itself, which - may decide to respond or not respond to the client's request - depending on the contents of the request. The protocol is extensible - at this point: at a minimum, the server requires that the client - demonstrate knowledge of the contents of the encrypted portion of the - hidden service descriptor. The service may additionally require a - user- or group-specific access token before it responds to requests. + The final level of access control happens at the server itself, which may + decide to respond or not respond to the client's request depending on the + contents of the request. The protocol is extensible at this point: at a + minimum, the server requires that the client demonstrate knowledge of the + contents of the encrypted portion of the hidden service descriptor. If + optional client authorization is enabled, the service may additionally + require the client to prove knowledge of a pre-shared private key. 1.4. In more detail: Distributing hidden service descriptors. [IMD:DIST] @@ -511,7 +522,7 @@ Table of contents: In order to operate a hidden service, the operator can generate in advance a number of blinded signing keys and descriptor signing - keys (and their credentials; see [DESC-OUTER] and [ENCRYPTED-DATA] + keys (and their credentials; see [DESC-OUTER] and [HS-DESC-ENC] below), and their corresponding descriptor encryption keys, and export those to the hidden service hosts. @@ -597,6 +608,33 @@ Table of contents: part of the Tor circuit extension handshake, used to tie a request to a particular circuit. +1.9.1. In even more detail: Client authorization keys [CLIENT-AUTH] + + When client authorization is enabled, each authorized client of a hidden + service has two more assymetric keypairs which are shared with the hidden + service. An entity without those keys is not able to use the hidden + service. Throughout this document, we assume that these pre-shared keys are + exchanged between the hidden service and its clients in a secure out-of-band + fashion. + + Specifically, each authorized client possesses: + + - An x25519 keypair used to compute decryption keys that allow the client to + decrypt the hidden service descriptor. See [HS-DESC-ENC]. + + - An ed25519 keypair which allows the client to compute signatures which + prove to the hidden service that the client is authorized. These + signatures are inserted into the INTRODUCE1 cell, and without them the + introduction to the hidden service cannot be completed. See [INTRO-AUTH]. + + The right way to exchange these keys is to have the client generate keys and + send the corresponding public keys to the hidden service out-of-band. An + easier but less secure way of doing this exchange would be to have the + hidden service generate the keypairs and pass the corresponding private keys + to its clients. See section [CLIENT-AUTH-MGMT] for more details on how these + keys should be managed. + + [TODO: Also specify stealth client authorization.] 2. Generating and publishing hidden service descriptors [HSDIR] @@ -610,7 +648,7 @@ Table of contents: 2.1. Deriving blinded keys and subcredentials [SUBCRED] - In each time period (see [TIME-PERIOD] for a definition of time + In each time period (see [TIME-PERIODS] for a definition of time periods), a hidden service host uses a different blinded private key to sign its directory information, and clients use a different blinded public key as the index for fetching that information. @@ -633,12 +671,10 @@ Table of contents: In the above formula, credential corresponds to: - credential = H(public-identity-key | authorization-key) + credential = H("credential" | public-identity-key) where public-identity-key is the public identity master key of the hidden - service, and authorization-key is an optional secret used for client - authorization. If no client authorization is specified, authorization-key is - left blank. + service. 2.2. Locating, uploading, and downloading hidden service descriptors [HASHRING] @@ -932,13 +968,13 @@ Table of contents: prevents an attacker from replacing a newer descriptor signed by a given key with a copy of an older version.) - "encrypted" NL encrypted-string + "superencrypted" NL encrypted-string [Exactly once.] - An encrypted blob, whose format is discussed in [ENCRYPTED-DATA] - below. The blob is base-64 encoded and enclosed in -----BEGIN - MESSAGE---- and ----END MESSAGE---- wrappers. + An encrypted blob, whose format is discussed in [HS-DESC-ENC] below. The + blob is base64 encoded and enclosed in -----BEGIN MESSAGE---- and + ----END MESSAGE---- wrappers. "signature" SP signature NL @@ -950,37 +986,195 @@ Table of contents: the hidden service host does not need to have its private blinded key online. -2.5. Hidden service descriptors: encryption format [ENCRYPTED-DATA] + HSDirs accept hidden service descriptors of up to 50k bytes (a consensus + parameter should also be introduced to control this value). - The encrypted part of the hidden service descriptor is encrypted and - authenticated with symmetric keys generated as follows: +2.5. Hidden service descriptors: encryption format [HS-DESC-ENC] - SALT = 16 bytes from H(random), changes each time we rebuld the - descriptor even if the content of the descriptor hasn't changed. - (So that we don't leak whether the intro point list etc. changed) + Hidden service descriptors are protected by two layers of encryption. + Clients need to decrypt both layers to connect to the hidden service. - secret_input = blinded_public_key | subcredential | - INT_8(revision_counter) - keys = KDF(secret_input, salt, "hsdir-encrypted-data", - S_KEY_LEN + S_IV_LEN + MAC_KEY_LEN) + The first layer of encryption provides confidentiality against entities who + don't know the public key of the hidden service (e.g. HSDirs), while the + second layer of encryption is only useful when client authorization is enabled + and protects against entities that do not possess valid client credentials. - SECRET_KEY = first S_KEY_LEN bytes of keys - SECRET_IV = next S_IV_LEN bytes of keys - MAC_KEY = last MAC_KEY_LEN bytes of keys +2.5.1. First layer of encryption [HS-DESC-FIRST-LAYER] - The encrypted data has the format: + The first layer of HS descriptor encryption is designed to protect + descriptor confidentiality against entities who don't know the blinded + public key of the hidden service. - SALT hashed random bytes from above [16 bytes] - ENCRYPTED The plaintext encrypted with S [variable] - MAC MAC of both above fields [32 bytes] +2.5.1.1. First layer encryption logic + + The encryption keys and format for the first layer of encryption are + generated as specified in [HS-DESC-ENCRYPTION-KEYS] with customization + parameters: + + SECRET_DATA = blinded-public-key + STRING_CONSTANT = "hsdir-superencrypted-data" + + The ciphertext is placed on the "superencrypted" field of the descriptor. + + Before encryption the plaintext is padded with NUL bytes to the nearest + multiple of 10k bytes. + +2.5.1.2. First layer plaintext format + + After clients decrypt the first layer of encryption, they need to parse the + plaintext to get to the second layer ciphertext which is contained in the + "encrypted" field. + + If client auth is enabled, the hidden service generates a fresh + descriptor_cookie key (32 random bytes) and encrypts it using each + authorized client's identity x25519 key. Authorized clients can use the + descriptor cookie to decrypt the second layer of encryption. Our encryption + scheme requires the hidden service to also generate an ephemeral x25519 + keypair for each new descriptor. + + If client auth is disabled, fake data is placed in each of the fields below + to obfuscate whether client authorization is enabled. + + Here are all the supported fields: + + "desc-auth-type" SP type NL + + [Exactly once] + + This field contains the type of authorization used to protect the + descriptor. The only recognized type is "x25519" and specifies the + encryption scheme described in this section. + + If client authorization is disabled, the value here should be "x25519". + + "desc-auth-ephemeral-key" SP key NL + + [Exactly once] + + This field contains an ephemeral x25519 public key generated by the + hidden service and encoded in base64. The key is used by the encryption + scheme below. + + If client authorization is disabled, the value here should be a fresh + x25519 pubkey that will remain unused. + + "auth-client" SP client-id SP iv SP encrypted-cookie + + [Any number] + + When client authorization is enabled, the hidden service inserts an + "auth-client" line for each of its authorized clients. If client + authorization is disabled, the fields here can be populated with random + data of the right size (that's 8 bytes for 'client-id', 16 bytes for 'iv' + and 16 bytes for 'encrypted-cookie' all encoded with base64). + + When client authorization is enabled, each "auth-client" line contains + the descriptor cookie encrypted to each individual client. We assume that + each authorized client possesses a pre-shared x25519 keypair which is + used to decrypt the descriptor cookie. + + We now describe the descriptor cookie encryption scheme. Here are the + relevant keys: + + client_x = private x25519 key of authorized client + client_X = public x25519 key of authorized client + hs_y = private key of ephemeral x25519 keypair of hidden service + hs_Y = public key of ephemeral x25519 keypair of hidden service + descriptor_cookie = descriptor cookie used to encrypt the descriptor + + And here is what the hidden service computes: + + SECRET_SEED = x25519(hs_y, client_X) + KEYS = KDF(SECRET_SEED, 40) + CLIENT-ID = fist 8 bytes of KEYS + COOKIE-KEY = last 32 bytes of KEYS + + Here is a description of the fields in the "auth-client" line: + + - The "client-id" field is CLIENT-ID from above encoded in base64. + + - The "iv" field is 16 random bytes encoded in base64. + + - The "encrypted-cookie" field contains the descriptor cookie ciphertext + as follows and is encoded in base64: + encrypted-cookie = STREAM(iv, COOKIE-KEY) XOR descriptor_cookie + + See section [FIRST-LAYER-CLIENT-BEHAVIOR] for the client-side logic of + how to decrypt the descriptor cookie. + + "encrypted" NL encrypted-string + + [Exactly once] + + An encrypted blob containing the second layer ciphertext, whose format is + discussed in [HS-DESC-SECOND-LAYER] below. The blob is base64 encoded + and enclosed in -----BEGIN MESSAGE---- and ----END MESSAGE---- wrappers. + +2.5.1.3. Client behavior [FIRST-LAYER-CLIENT-BEHAVIOR] + + The goal of clients at this stage is to decrypt the "encrypted" field as + described in [HS-DESC-SECOND-LAYER]. + + If client authorization is enabled, authorized clients need to extract the + descriptor cookie to proceed with decryption of the second layer as + follows: + + An authorized client parsing the first layer of an encrypted descriptor, + extracts the ephemeral key from "desc-auth-ephemeral-key" and calculates + CLIENT-ID and COOKIE-KEY as described in the section above using their + x25519 private key. The client then uses CLIENT-ID to find the right + "auth-client" field which contains the ciphertext of the descriptor + cookie. The client then uses COOKIE-KEY and the iv to decrypt the + descriptor_cookie, which is used to decrypt the second layer of descriptor + encryption as described in [HS-DESC-SECOND-LAYER]. + +2.5.1.4. Hiding client authorization data + + Hidden services should avoid leaking whether client authorization is + enabled or how many authorized clients there are. + + Hence even when client authorization is disabled, the hidden service adds + fake "desc-auth-type", "desc-auth-ephemeral-key" and "auth-client" lines to + the descriptor, as described in [HS-DESC-FIRST-LAYER]. - The encryption format is ENCRYPTED = - STREAM(SECRET_IV,SECRET_KEY) XOR Plaintext + The hidden service also avoids leaking the number of authorized clients by + adding fake "auth-client" entries to its descriptor. Specifically, + descriptors always contain a number of authorized clients that is a + multiple of 16 by adding fake "auth-client" entries if needed. + [XXX consider randomization of the value 16] - Before encryption, the plaintext must be padded to a multiple of 4096 bytes - with NUL bytes. + Clients MUST accept descriptors with any number of "auth-client" lines as + long as the total descriptor size is within the max limit of 50k (also + controlled with a consensus parameter). - The plaintext format is: +2.5.2. Second layer of encryption [HS-DESC-SECOND-LAYER] + + The second layer of descriptor encryption is designed to protect descriptor + confidentiality against unauthorized clients. If client authorization is + enabled, it's encrypted using the descriptor_cookie, and contains needed + information for connecting to the hidden service, like the list of its + introduction points. + + If client authorization is disabled, then the second layer of HS encryption + does not offer any additional security, but is still used. + +2.5.2.1. Second layer encryption keys + + The encryption keys and format for the second layer of encryption are + generated as specified in [HS-DESC-ENCRYPTION-KEYS] with customization + parameters as follows: + + SECRET_DATA = blinded-public-key | descriptor_cookie + STRING_CONSTANT = "hsdir-encrypted-data" + + If client authorization is disabled the 'descriptor_cookie' field is left blank. + + The ciphertext is placed on the "encrypted" field of the descriptor. + +2.5.2.2. Second layer plaintext format + + After decrypting the second layer ciphertext, clients can finally learn the + list of intro points etc. The plaintext has the following format: "create2-formats" SP formats NL @@ -991,14 +1185,14 @@ Table of contents: tor-spec.txt. See tor-spec section 5.1 for a list of recognized handshake types. - "authentication-required" SP types NL + "intro-auth-required" SP types NL [At most once] - A space-separated list of authentication types. A client that does - not support at least one of these authentication types will not be - able to contact the host. Recognized types are: 'password' and - 'ed25519'. See [INTRO-AUTH] below. + A space-separated list of introduction-layer authentication types; see + section [INTRO-AUTH] for more info. A client that does not support at + least one of these authentication types will not be able to contact the + host. Recognized types are: 'password' and 'ed25519'. "single-onion-service" @@ -1069,7 +1263,43 @@ Table of contents: Other encryption and authentication key formats are allowed; clients should ignore ones they do not recognize. -2.5.1. Number of introduction points [NUM_INTRO_POINT] + Clients who manage to extract the introduction points of the hidden service + can prroceed with the introduction protocol as specified in [INTRO-PROTOCOL]. + +2.5.3. Deriving hidden service descriptor encryption keys [HS-DESC-ENCRYPTION-KEYS] + + In this section we present the generic encryption format for hidden service + descriptors. We use the same encryption format in both encryption layers, + hence we introduce two customization parameters SECRET_DATA and + STRING_CONSTANT which vary between the layers. + + The SECRET_DATA parameter specifies the secret data that are used during + encryption key generation, while STRING_CONSTANT is merely a string constant + that is used as part of the KDF. + + Here is the key generation logic: + + SALT = 16 bytes from H(random), changes each time we rebuld the + descriptor even if the content of the descriptor hasn't changed. + (So that we don't leak whether the intro point list etc. changed) + + secret_input = SECRET_DATA | subcredential | INT_8(revision_counter) + + keys = KDF(secret_input | salt | STRING_CONSTANT, S_KEY_LEN + S_IV_LEN + MAC_KEY_LEN) + + SECRET_KEY = first S_KEY_LEN bytes of keys + SECRET_IV = next S_IV_LEN bytes of keys + MAC_KEY = last MAC_KEY_LEN bytes of keys + + The encrypted data has the format: + + SALT hashed random bytes from above [16 bytes] + ENCRYPTED The ciphertext [variable] + MAC MAC of both above fields [32 bytes] + + The final encryption format is ENCRYPTED = STREAM(SECRET_IV,SECRET_KEY) XOR Plaintext + +2.5.4. Number of introduction points [NUM_INTRO_POINT] This section defines how many introduction points an hidden service descriptor can have at minimum, by default and the maximum: @@ -1085,7 +1315,7 @@ Table of contents: HSDirs) but also in order for the descriptor size to not overwhelmed hidden service directories with user defined values that could be gigantic. -3. The introduction protocol +3. The introduction protocol [INTRO-PROTOCOL] The introduction protocol proceeds in three steps. @@ -1858,3 +2088,95 @@ Appendix E. Reserved numbers Note: The value "0A" is skipped because it's reserved for the onion key cross-certifying ntor identity key from proposal 228. + +Appendix F. Managing authorized client data [CLIENT-AUTH-MGMT] + + Hidden services and clients can configure their authorized client data either + using the torrc, or using the control port. This section presents a suggested + scheme for configuring client authorization. + + F.1. Configuring client authorization using torrc + + F.1.1. Hidden Service side + + A hidden service that wants to perform client authorization, adds a new + option HiddenServiceAuthorizeClient to its torrc file: + + HiddenServiceAuthorizeClient auth-type client-name,client-name,... + + The only recognized auth-type value is "basic" which describes the scheme in + section [CLIENT-AUTH]. The rest of the line is a comma-separated list of + human-readable authorized client names. + + Let's consider that one of the listed client names is "alice". In this case, + Tor checks the directory at "DataDirectory/hidden_service/client_auth/" for + any files with filename alice.key or alice.pub . + + Files ending in .key contain private keys for authorized clients, whereas + .pub files contain public keys for authorized clients. In general, authorized + clients should send their public keys to the hidden service operator, and the + operator should place them in the filesystem as .pub files. Only .pub files + are useful to the hidden service, whereas .key files are there only if the + hidden service had to generate its client's keypairs as described below. + + If no alice.key or alice.pub files exist, Tor is tasked with generating + client keys for Alice. To do so, Tor generates x25519 and ed25519 keypairs + for Alice, then makes an alice.key file and writes the private keys inside; + it also makes an alice.pub file and writes the public keys inside. + [XXX what format? it should be convenient so that client can just copy-paste] + + In this case, the hidden service operator has the responsibility to pass the + .key file to Alice in a secure out-of-band way. After the file is passed to + Alice, it can be shredded from the filesystem, as only the public keys are + required for the hidden service to function. + + F.1.2. Client side + + A client who wants to register client authorization data for a hidden service + needs to add the following line to their torrc: + + HidServAuth onion-address x25519-private-key ed25519-private-key + + The keys above are either generated by Alice using a key generation utility, + or they are extracted from a .key file provided by the hidden service. + + In the former case, the client is also tasked with transfering the public + keys to the hidden service in a secure out-of-band way. + + F.2. Configuring client authorization using the control port + + F.2.1. Service side + + A hidden service also has the option to configure authorized clients + using the control port. The idea is that hidden service operators can use + controller utilities that manage their access control instead of using + the filesystem to register client keys. + + Specifically, we require a new control port command ADD_ONION_CLIENT_AUTH + which is able to register x25519/ed25519 public keys tied to a specific + authorized client. + [XXX figure out control port command format] + + Hidden services who use the control port interface for client auth need + to perform their own key management. + + F.2.2. Client side + + There should also be a control port interface for clients to register + authorization data for hidden services without having to use the + torrc. It should allow both generation of client authorization private + keys, and also to import client authorization data provided by a hidden + service + + This way, Tor Browser can present "Generate client auth keys" and "Import + client auth keys" dialogs to users when they try to visit a hidden service + that is protected by client authorization. + + Specifically, we require two new control port commands: + IMPORT_ONION_CLIENT_AUTH_DATA + GENERATE_ONION_CLIENT_AUTH_DATA + which import and generate client authorization data respectively. + + [XXX how does key management work here?] + [XXX what happens when people use both the control port interface and the + filesystem interface?]

1 0

[sandboxed-tor-browser/master] Bug #20847: Make Print to File work.
by yawning＠torproject.org 01 Dec '16

01 Dec '16

commit 7cefb4c8013800b9c445e7c99e34b9ddf670841c Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Dec 1 20:38:45 2016 +0000 Bug #20847: Make Print to File work. At least this was simple to fix, printing is handled by Gtk, and the appropriate backend was missing. --- .../internal/sandbox/application.go | 30 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index 7620802..1e8696d 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -554,30 +554,52 @@ func (h *hugbox) appendRestrictedGtk2() ([]string, string, error) { libAdwaita = "libadwaita.so" libPixmap = "libpixmap.so" libPngLoader = "libpixbufloader-png.so" + libPrintFile = "libprintbackend-file.so" - gtkSubDir = "gtk-2.0/2.10.0/engines" - gdkSubDir = "gdk-pixbuf-2.0/2.10.0/loaders" + engineSubDir = "gtk-2.0/2.10.0/engines" + printSubDir = "gtk-2.0/2.10.0/printbackends" + gdkSubDir = "gdk-pixbuf-2.0/2.10.0/loaders" ) gtkLibs := []string{} gtkLibPath := "" + setGtkPath := false // Figure out where the system keeps the Gtk+-2.0 theme libraries, // and bind mount in Adwaita and Pixmap. - adwaitaPath := findDistributionDependentLibs(gtkSubDir, libAdwaita) + adwaitaPath := findDistributionDependentLibs(engineSubDir, libAdwaita) if adwaitaPath != "" { gtkEngineDir, _ := filepath.Split(adwaitaPath) normGtkEngineDir := filepath.Join(restrictedLibDir, "gtk-2.0", "2.10.0", "engines") h.roBind(adwaitaPath, filepath.Join(normGtkEngineDir, libAdwaita), false) h.roBind(filepath.Join(gtkEngineDir, libPixmap), filepath.Join(normGtkEngineDir, libPixmap), true) - h.setenv("GTK_PATH", filepath.Join(restrictedLibDir, "gtk-2.0")) + setGtkPath = true gtkLibs = append(gtkLibs, libAdwaita) gtkLibPath = gtkLibPath + ":" + gtkEngineDir } else { log.Printf("sandbox: Failed to find gtk-2.0 libadwaita.so.") } + // Figure out where the system keeps the Gtk+-2.0 print backends, + // and bind mount in the file one. + printFilePath := findDistributionDependentLibs(printSubDir, libPrintFile) + if printFilePath != "" { + gtkPrintDir, _ := filepath.Split(printFilePath) + normGtkPrintDir := filepath.Join(restrictedLibDir, "gtk-2.0", "2.10.0", "printbackends") + h.roBind(printFilePath, filepath.Join(normGtkPrintDir, libPrintFile), false) + + setGtkPath = true + gtkLibs = append(gtkLibs, libPrintFile) + gtkLibPath = gtkLibPath + ":" + gtkPrintDir + } else { + log.Printf("sandbox: Failed to find gtk-2.0 libprintbackend-file.so.") + } + + if setGtkPath { + h.setenv("GTK_PATH", filepath.Join(restrictedLibDir, "gtk-2.0")) + } + // Figure out if the system gdk-pixbuf-2.0 needs loaders for common // file formats. Arch and Fedora 25 do not. Debian does. As far as // I can tell, the only file format we actually care about is PNG.

1 0

[sandboxed-tor-browser/master] Remove the tor DataDir on (re)install.
by yawning＠torproject.org 01 Dec '16

01 Dec '16

commit 83cd60192d156450bf7472f1d7c63a5ca12ecebc Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Dec 1 19:24:05 2016 +0000 Remove the tor DataDir on (re)install. --- src/cmd/sandboxed-tor-browser/internal/ui/install.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cmd/sandboxed-tor-browser/internal/ui/install.go b/src/cmd/sandboxed-tor-browser/internal/ui/install.go index 5680319..e8858b4 100644 --- a/src/cmd/sandboxed-tor-browser/internal/ui/install.go +++ b/src/cmd/sandboxed-tor-browser/internal/ui/install.go @@ -23,6 +23,7 @@ import ( "fmt" "io/ioutil" "log" + "os" "path/filepath" "runtime" "time" @@ -120,6 +121,8 @@ func (c *Common) DoInstall(async *Async) { log.Printf("install: Installing Tor Browser.") async.UpdateProgress("Installing Tor Browser.") + os.RemoveAll(c.Cfg.TorDataDir) // Remove the tor directory. + if err := installer.ExtractBundle(c.Cfg.BundleInstallDir, bundleTarXz, async.Cancel); err != nil { async.Err = err if async.Err == installer.ErrExtractionCanceled {

1 0

[tor-messenger-build/master] Don't allow javascript: links in themes
by arlo＠torproject.org 01 Dec '16

01 Dec '16

commit 4bf82e39c706b680ede94f0c894c4352a6080a25 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Dec 1 11:09:04 2016 -0800 Don't allow javascript: links in themes --- ChangeLog | 1 + .../0001-Set-Tor-Messenger-preferences.patch | 43 +++++++++++--------- ...0002-Trac-16489-Prevent-account-autologin.patch | 14 +++---- ...Support-Special-Characters-input-prompt-o.patch | 10 ++--- ...Better-error-reporting-for-failed-outgoin.patch | 8 ++-- .../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 10 ++--- ...-Fix-tab-strip-background-colour-on-OS-X..patch | 6 +-- ...-XMPP-createConversation-should-handle-in.patch | 6 +-- ...-Set-_userVCard-own-property-when-downloa.patch | 6 +-- .../0009-XMPP-in-band-registration.patch | 20 +++++----- .../instantbird/0010-Remove-search-from-UI.patch | 8 ++-- .../0011-Add-Tor-Messenger-branding.patch | 46 +++++++++++----------- projects/instantbird/0012-Account-picture.patch | 6 +-- .../0013-Modify-protocol-defaults.patch | 8 ++-- .../instantbird/0014-Modify-IRC-defaults.patch | 8 ++-- projects/instantbird/0015-Modify-themes.patch | 10 ++--- .../instantbird/0016-Modify-XMPP-defaults.patch | 8 ++-- projects/instantbird/0017-Remove-logging-UI.patch | 6 +-- projects/instantbird/0018-Cert-override.patch | 12 +++--- .../0019-Display-all-traffic-over-Tor.patch | 8 ++-- .../instantbird/0020-Trac-17480-Content-sink.patch | 8 ++-- .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch | 12 +++--- ...-msg-is-not-defined-error-in-irc.js-chang.patch | 6 +-- ...Contact-list-entries-should-adapt-their-h.patch | 20 +++++----- ...1187281-Only-show-close-button-on-Windows.patch | 6 +-- ...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 34 ++++++++-------- 26 files changed, 168 insertions(+), 162 deletions(-) diff --git a/ChangeLog b/ChangeLog index c661505..3e3f64e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Tor Messenger 0.3.0b2 -- * Use the tor-browser-45.5.1esr-6.0-1-build1 tag on tor-browser * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45 * Update tor-browser to 6.0.7 + * Don't allow javascript: links in themes Tor Messenger 0.3.0b1 -- November 22, 2016 * All Platforms diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 63f721b..2a75c3b 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,24 +1,24 @@ -From e1433d0d96a99a6382b70fffa60158b8b5efeefa Mon Sep 17 00:00:00 2001 +From 0df511dda30a868bc85824931ea0c4c56b1fbf03 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:48:41 -0700 Subject: [PATCH 01/25] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 403 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 382 insertions(+), 21 deletions(-) + im/app/profile/all-instantbird.js | 406 +++++++++++++++++++++++++++++++++++--- + 1 file changed, 384 insertions(+), 22 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index b7a3970..ce25d3a 100644 +index b7a397017..6fc2c90a7 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -1,3 +1,46 @@ +@@ -1,3 +1,47 @@ +/** + * This file is divded into three section, + * + * 1) Tor Messenger prefs, not found in the next two sections; + * 2) The original Instantbird prefs found here, modified by TM; -+ * 3) Tor Browser's 000-tor-browser.js, modified by TM or commented out when -+ * duplicating a previously declared pref. ++ * 3) Tor Browser's browser/app/profile/000-tor-browser.js, modified by TM ++ * or commented out when duplicating a previously declared pref. + * + * The idea being that to update this file when rebasing, we'd just paste the + * full contents of those files over the corresponding sections and then look @@ -26,6 +26,7 @@ index b7a3970..ce25d3a 100644 + */ + + ++// NOTE: These are mostly found in chat/chat-prefs.js + +// Disable all logging +pref("purple.logging.log_chats", false); @@ -58,7 +59,7 @@ index b7a3970..ce25d3a 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 +71,7 @@ pref("general.autoScroll", true); +@@ -28,7 +72,7 @@ pref("general.autoScroll", true); // 0 = spellcheck nothing // 1 = check multi-line controls [default] // 2 = check multi/single line controls @@ -67,7 +68,7 @@ index b7a3970..ce25d3a 100644 pref("messenger.accounts.convertOldPasswords", true); pref("messenger.accounts.promptOnDelete", true); -@@ -66,7 +109,7 @@ pref("extensions.mintrayr.singleClickRestore", false); +@@ -66,7 +110,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. @@ -76,7 +77,7 @@ index b7a3970..ce25d3a 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 +185,23 @@ pref("app.update.staging.enabled", true); +@@ -142,26 +186,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 @@ -108,7 +109,7 @@ index b7a3970..ce25d3a 100644 // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -202,7 +242,7 @@ pref("browser.search.order.1", "chrome://instantbird/locale/regio +@@ -202,7 +243,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 @@ -117,7 +118,7 @@ index b7a3970..ce25d3a 100644 // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -222,10 +262,10 @@ pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +263,10 @@ pref("extensions.ignoreMTimeChanges", false); pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0"); @@ -130,7 +131,7 @@ index b7a3970..ce25d3a 100644 // Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); -@@ -245,9 +285,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% +@@ -245,9 +286,9 @@ pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE% pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); // suppress external-load warning for standard browser schemes @@ -143,8 +144,12 @@ index b7a3970..ce25d3a 100644 // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -262,10 +302,10 @@ pref("network.protocol-handler.expose.https", true); - pref("network.protocol-handler.expose.javascript", true); +@@ -259,13 +300,13 @@ pref("network.protocol-handler.expose.https", true); + + // expose javascript: so that message themes can use it. + // javascript: links inside messages are filtered out. +-pref("network.protocol-handler.expose.javascript", true); ++pref("network.protocol-handler.expose.javascript", false); // 0-Accept, 1-dontAcceptForeign, 2-dontUse -pref("network.cookie.cookieBehavior", 0); @@ -156,7 +161,7 @@ index b7a3970..ce25d3a 100644 // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +340,335 @@ pref("browser.tabs.tabClipWidth", 140); +@@ -300,14 +341,335 @@ pref("browser.tabs.tabClipWidth", 140); // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1); @@ -448,7 +453,7 @@ index b7a3970..ce25d3a 100644 + +// Putting the search engine prefs into this file to fix #11236. +// Default search engine -+//pref("browser.search.defaultenginename", "Disconnect"); // TM ++//pref("browser.search.defaultenginename", "DuckDuckGo"); // TM +// Make sure we use the same search engine regardless of locale +pref("browser.search.geoSpecificDefaults", false); + @@ -456,7 +461,7 @@ index b7a3970..ce25d3a 100644 +// Somewhat surprisingly we get some random behavior if we specify more than +// two search engines as below. See +// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. -+//pref("browser.search.order.extra.1", "Disconnect"); // TM ++//pref("browser.search.order.extra.1", "DuckDuckGo"); // TM +//pref("browser.search.order.extra.2", "YouTube"); // TM + +// Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? @@ -496,5 +501,5 @@ index b7a3970..ce25d3a 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch index 4d05d86..f13e124 100644 --- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch +++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch @@ -1,4 +1,4 @@ -From eccb4c61667e2887f335b780dcf3f1545d03cbb3 Mon Sep 17 00:00:00 2001 +From 11b8b6e1d0a75e22558353d6faf07c705e624054 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/25] Trac 16489: Prevent account autologin @@ -12,7 +12,7 @@ Subject: [PATCH 02/25] Trac 16489: Prevent account autologin 5 files changed, 2 insertions(+), 35 deletions(-) diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts.js -index c13c610..5bfea57 100644 +index c13c6100d..5bfea57f2 100644 --- a/chat/components/src/imAccounts.js +++ b/chat/components/src/imAccounts.js @@ -588,7 +588,7 @@ imAccount.prototype = { @@ -25,7 +25,7 @@ index c13c610..5bfea57 100644 autoLogin = this.prefBranch.getBoolPref(kPrefAccountAutoLogin); } catch (e) { } diff --git a/im/content/account.xml b/im/content/account.xml -index e063318..78195b7 100644 +index e06331875..78195b71f 100644 --- a/im/content/account.xml +++ b/im/content/account.xml @@ -41,10 +41,6 @@ @@ -40,7 +40,7 @@ index e063318..78195b7 100644 <xul:hbox flex="1" class="account-buttons" anonid="buttons" xbl:inherits="autologin"/> diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 73707c9..ed3b8f0 100644 +index 73707c9e2..ed3b8f0f7 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -442,22 +442,13 @@ var accountWizard = { @@ -68,7 +68,7 @@ index 73707c9..ed3b8f0 100644 let am = window.opener.gAccountManager; if (am) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 5fa5b82..9eb5352 100644 +index 5fa5b8293..9eb5352a6 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -137,8 +137,6 @@ @@ -81,7 +81,7 @@ index 5fa5b82..9eb5352 100644 </wizard> diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul -index e5f7fb6..5e0024d 100644 +index e5f7fb659..5e0024d86 100644 --- a/im/content/preferences/main.xul +++ b/im/content/preferences/main.xul @@ -20,7 +20,6 @@ @@ -117,5 +117,5 @@ index e5f7fb6..5e0024d 100644 <caption label="&accountsMgr.label;"/> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch index 3b2cf27..ddb44bb 100644 --- a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch +++ b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch @@ -1,4 +1,4 @@ -From d433556773d91789bd05019c64a751a8afcdd763 Mon Sep 17 00:00:00 2001 +From 7086cb8f65f506ec27767f2a2d03295b3e77b817 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Sat, 30 Jan 2016 20:56:38 +0100 Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt @@ -14,7 +14,7 @@ Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/im/content/instantbird.xul b/im/content/instantbird.xul -index 15a3f98..d208921 100644 +index 15a3f988b..d20892198 100644 --- a/im/content/instantbird.xul +++ b/im/content/instantbird.xul @@ -48,7 +48,28 @@ @@ -48,7 +48,7 @@ index 15a3f98..d208921 100644 <commandset id="conversationsCommands"> diff --git a/im/content/menus.xul b/im/content/menus.xul -index 0889ce8..894ef13 100644 +index 0889ce87d..894ef13c4 100644 --- a/im/content/menus.xul +++ b/im/content/menus.xul @@ -43,7 +43,7 @@ @@ -61,7 +61,7 @@ index 0889ce8..894ef13 100644 <menuitem id="addBuddyMenuItem" label="&addContact;" command="cmd_addbuddy" key="addBuddykey" accesskey="&addContact.accesskey;"/> <menuitem id="newTabMenuItem" label="&newtab;" command="cmd_newtab" key="newtabkey" accesskey="&newtab.accesskey;"/> diff --git a/im/content/menus.xul.inc b/im/content/menus.xul.inc -index 30aeb1f..14fc9e8 100644 +index 30aeb1fc5..14fc9e8f6 100644 --- a/im/content/menus.xul.inc +++ b/im/content/menus.xul.inc @@ -2,6 +2,8 @@ @@ -74,5 +74,5 @@ index 30aeb1f..14fc9e8 100644 <keyset id="mainkeyset"/> <menubar id="blistMenubar"/> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch index e8d0da9..9178fb3 100644 --- a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch +++ b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch @@ -1,4 +1,4 @@ -From 3d8ced7b6852eb7fbee140825e39345906768729 Mon Sep 17 00:00:00 2001 +From 00767571b5e29389a54897cbbf28efc3fe96f9ca Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 2 Feb 2016 16:04:51 -0800 Subject: [PATCH 04/25] Trac 17494: Better error reporting for failed outgoing @@ -11,7 +11,7 @@ Subject: [PATCH 04/25] Trac 17494: Better error reporting for failed outgoing 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties -index 7f824e5..293ab01 100644 +index 7f824e534..293ab01d4 100644 --- a/chat/locales/en-US/xmpp.properties +++ b/chat/locales/en-US/xmpp.properties @@ -66,7 +66,10 @@ conversation.error.sendFailedAsNotInRoom=Message could not be sent to %1$S as yo @@ -35,7 +35,7 @@ index 7f824e5..293ab01 100644 # LOCALIZATION NOTE (tooltip.*): # These are the titles of lines of information that will appear in diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm -index 67cab77..0022be3 100644 +index 67cab7743..0022be35f 100644 --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm @@ -679,11 +679,18 @@ var XMPPConversationPrototype = { @@ -63,5 +63,5 @@ index 67cab77..0022be3 100644 else if (this._isMucParticipant && muc && !muc.left && error.condition == "item-not-found") { -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch index bfb301c..c48bc6b 100644 --- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch +++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch @@ -1,4 +1,4 @@ -From 5c5afcd859e98522928bd1bfcd70d665c5fb579c Mon Sep 17 00:00:00 2001 +From a9b62bbc374934c2910ce53fb0668659cec4e73b Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 15 Mar 2016 17:40:42 -0700 Subject: [PATCH 05/25] Trac 13312: OTR over Twitter DMs @@ -10,7 +10,7 @@ Subject: [PATCH 05/25] Trac 13312: OTR over Twitter DMs 3 files changed, 289 insertions(+), 208 deletions(-) diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js -index 6fc5d0d..2a53a2c 100644 +index 6fc5d0d24..2a53a2c86 100644 --- a/chat/components/src/imConversations.js +++ b/chat/components/src/imConversations.js @@ -414,7 +414,8 @@ UIConversation.prototype = { @@ -24,7 +24,7 @@ index 6fc5d0d..2a53a2c 100644 this._messages.push(aSubject); ++this._unreadMessageCount; diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm -index ee067af..abd95fc 100644 +index ee067afdf..abd95fc71 100644 --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm @@ -47,6 +47,7 @@ var kAllowedMozClasses = @@ -66,7 +66,7 @@ index ee067af..abd95fc 100644 'font': { 'face': true, diff --git a/chat/protocols/twitter/twitter.js b/chat/protocols/twitter/twitter.js -index 59f60cc..4d8e04c 100644 +index 59f60cc22..4d8e04c02 100644 --- a/chat/protocols/twitter/twitter.js +++ b/chat/protocols/twitter/twitter.js @@ -36,8 +36,11 @@ ChatBuddy.prototype = { @@ -739,5 +739,5 @@ index 59f60cc..4d8e04c 100644 }; -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch index 6350a49..26fcaa3 100644 --- a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch +++ b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch @@ -1,4 +1,4 @@ -From d9a7eb05a9c292f8e9be864e6d77da581c1371b2 Mon Sep 17 00:00:00 2001 +From 8e736ffd5f007847f305bda7dd44fca761e96a6f Mon Sep 17 00:00:00 2001 From: Nihanth Subramanya <nhnt11(a)gmail.com> Date: Sun, 9 Oct 2016 21:53:04 -0700 Subject: [PATCH 06/25] Bug 1218193 - Fix tab strip background colour on OS X. @@ -9,7 +9,7 @@ Subject: [PATCH 06/25] Bug 1218193 - Fix tab strip background colour on OS X. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/im/themes/tabbrowser-pinstripe/tabbrowser.css b/im/themes/tabbrowser-pinstripe/tabbrowser.css -index 76c5094..2915450 100644 +index 76c5094e3..291545039 100644 --- a/im/themes/tabbrowser-pinstripe/tabbrowser.css +++ b/im/themes/tabbrowser-pinstripe/tabbrowser.css @@ -208,7 +208,7 @@ statusbarpanel#statusbar-display { @@ -22,5 +22,5 @@ index 76c5094..2915450 100644 background-repeat: repeat-x; } -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch index c18cca0..071f916 100644 --- a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch +++ b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch @@ -1,4 +1,4 @@ -From 21254cac1e256e3468bfec270ad5898b33066a8b Mon Sep 17 00:00:00 2001 +From f709123309faa68e9b243b63ac548048731db0fd Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 21:57:07 -0700 Subject: [PATCH 07/25] Bug 1246431 - XMPP createConversation should handle @@ -9,7 +9,7 @@ Subject: [PATCH 07/25] Bug 1246431 - XMPP createConversation should handle 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm -index 0022be3..4420a1d 100644 +index 0022be35f..4420a1d17 100644 --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm @@ -2108,7 +2108,7 @@ var XMPPAccountPrototype = { @@ -22,5 +22,5 @@ index 0022be3..4420a1d 100644 throw "Invalid JID"; } -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch index 29f4833..789cd5f 100644 --- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch +++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch @@ -1,4 +1,4 @@ -From c5d6eb544b71fb444fdf3b9b36965ed9a48070e8 Mon Sep 17 00:00:00 2001 +From 9866b6d2ec361d987d6bdc48014427df7139ea6c Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 28 Aug 2016 08:57:41 -0700 Subject: [PATCH 08/25] Bug 1298574 - Set _userVCard own property when @@ -10,7 +10,7 @@ Subject: [PATCH 08/25] Bug 1298574 - Set _userVCard own property when 1 file changed, 14 insertions(+) diff --git a/chat/protocols/xmpp/xmpp.jsm b/chat/protocols/xmpp/xmpp.jsm -index 4420a1d..71f7770 100644 +index 4420a1d17..71f777009 100644 --- a/chat/protocols/xmpp/xmpp.jsm +++ b/chat/protocols/xmpp/xmpp.jsm @@ -2243,6 +2243,20 @@ var XMPPAccountPrototype = { @@ -35,5 +35,5 @@ index 4420a1d..71f7770 100644 }, -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch index d68aa7d..bea0077 100644 --- a/projects/instantbird/0009-XMPP-in-band-registration.patch +++ b/projects/instantbird/0009-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From ed0b86bfdda083aaf7ecd7cbcf824d3874c1e332 Mon Sep 17 00:00:00 2001 +From ddb8fa8041c1808676b277cbe405aeb970b466b6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:42:25 -0700 Subject: [PATCH 09/25] XMPP in-band registration @@ -17,7 +17,7 @@ Subject: [PATCH 09/25] XMPP in-band registration create mode 100644 im/content/xmppRegister.xul diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties -index 293ab01..237d20c 100644 +index 293ab01d4..237d20c92 100644 --- a/chat/locales/en-US/xmpp.properties +++ b/chat/locales/en-US/xmpp.properties @@ -13,6 +13,9 @@ connection.initializingEncryption=Initializing encryption @@ -40,7 +40,7 @@ index 293ab01..237d20c 100644 # LOCALIZATION NOTE (conversation.error.notDelivered): diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm -index 24618ee..246ec2b 100644 +index 24618ee0c..246ec2b7c 100644 --- a/chat/protocols/xmpp/xmpp-session.jsm +++ b/chat/protocols/xmpp/xmpp-session.jsm @@ -11,6 +11,8 @@ Cu.import("resource:///modules/socket.jsm"); @@ -150,7 +150,7 @@ index 24618ee..246ec2b 100644 this.ERROR("Unexpected stanza " + aStanza.localName + ", expected 'features'"); this._networkError(_("connection.error.incorrectResponse")); diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index ed3b8f0..7c26d0d 100644 +index ed3b8f0f7..7c26d0d6e 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -119,6 +119,12 @@ var accountWizard = { @@ -176,7 +176,7 @@ index ed3b8f0..7c26d0d 100644 let option = this.prefs[i]; let opt = option.opt; diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 9eb5352..759f42b 100644 +index 9eb5352a6..759f42b38 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -65,6 +65,7 @@ @@ -188,7 +188,7 @@ index 9eb5352..759f42b 100644 <wizardpage id="accountpassword" pageid="accountpassword" next="accountadvanced" diff --git a/im/content/jar.mn b/im/content/jar.mn -index 98d9a09..20ea9dc 100644 +index 98d9a09a9..20ea9dce7 100644 --- a/im/content/jar.mn +++ b/im/content/jar.mn @@ -61,6 +61,8 @@ instantbird.jar: @@ -202,7 +202,7 @@ index 98d9a09..20ea9dc 100644 content/instantbird/menus-mac.xul diff --git a/im/content/xmppRegister.js b/im/content/xmppRegister.js new file mode 100644 -index 0000000..52852f0 +index 000000000..52852f045 --- /dev/null +++ b/im/content/xmppRegister.js @@ -0,0 +1,142 @@ @@ -350,7 +350,7 @@ index 0000000..52852f0 +} diff --git a/im/content/xmppRegister.xul b/im/content/xmppRegister.xul new file mode 100644 -index 0000000..e2bd367 +index 000000000..e2bd36750 --- /dev/null +++ b/im/content/xmppRegister.xul @@ -0,0 +1,27 @@ @@ -382,7 +382,7 @@ index 0000000..e2bd367 + +</dialog> diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -index 43d0f19..c46fb2f 100644 +index 43d0f19e3..c46fb2f95 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd @@ -31,3 +31,5 @@ @@ -392,5 +392,5 @@ index 43d0f19..c46fb2f 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch index 3a8208b..4fcde9a 100644 --- a/projects/instantbird/0010-Remove-search-from-UI.patch +++ b/projects/instantbird/0010-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From bde276da0f20ebf4815a9b0b2a5c7152d067b019 Mon Sep 17 00:00:00 2001 +From b1c97ccedc4099704e06e3c1d676b7af7fe8dba0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 10/25] Remove search from UI @@ -9,7 +9,7 @@ Subject: [PATCH 10/25] Remove search from UI 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/im/content/nsContextMenu.js b/im/content/nsContextMenu.js -index 5261b79..f667793 100644 +index 5261b793f..f667793be 100644 --- a/im/content/nsContextMenu.js +++ b/im/content/nsContextMenu.js @@ -468,23 +468,7 @@ nsContextMenu.prototype = { @@ -38,7 +38,7 @@ index 5261b79..f667793 100644 // Returns true if anything is selected. diff --git a/im/content/preferences/advanced.xul b/im/content/preferences/advanced.xul -index fad67c1..cfe2405 100644 +index fad67c190..cfe2405ea 100644 --- a/im/content/preferences/advanced.xul +++ b/im/content/preferences/advanced.xul @@ -143,17 +143,6 @@ @@ -60,5 +60,5 @@ index fad67c1..cfe2405 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch index 537ae08..f5a2c1a 100644 --- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 506c39b4736f8c983aa47303d7b2487dbf7e57c9 Mon Sep 17 00:00:00 2001 +From 9465dccf0297c300caf410f0e31ae49acbdf6a61 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:56:27 -0700 Subject: [PATCH 11/25] Add Tor Messenger branding @@ -101,7 +101,7 @@ Subject: [PATCH 11/25] Add Tor Messenger branding create mode 100644 im/content/browserMountPoints.inc diff --git a/im/app/macbuild/Contents/Info.plist.in b/im/app/macbuild/Contents/Info.plist.in -index 615e4e6..ac61e61 100644 +index 615e4e6b8..ac61e6134 100644 --- a/im/app/macbuild/Contents/Info.plist.in +++ b/im/app/macbuild/Contents/Info.plist.in @@ -11,7 +11,7 @@ @@ -115,7 +115,7 @@ index 615e4e6..ac61e61 100644 <key>CFBundleName</key> diff --git a/im/branding/messenger/Makefile.in b/im/branding/messenger/Makefile.in new file mode 100644 -index 0000000..b430956 +index 000000000..b4309568e --- /dev/null +++ b/im/branding/messenger/Makefile.in @@ -0,0 +1,49 @@ @@ -183,7 +183,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/branding.nsi b/im/branding/messenger/branding.nsi new file mode 100755 -index 0000000..4683827 +index 000000000..4683827fa --- /dev/null +++ b/im/branding/messenger/branding.nsi @@ -0,0 +1,13 @@ @@ -202,7 +202,7 @@ index 0000000..4683827 + diff --git a/im/branding/messenger/configure.sh b/im/branding/messenger/configure.sh new file mode 100644 -index 0000000..7e58051 +index 000000000..7e580518b --- /dev/null +++ b/im/branding/messenger/configure.sh @@ -0,0 +1,5 @@ @@ -1218,7 +1218,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/content/aboutDialog.css b/im/branding/messenger/content/aboutDialog.css new file mode 100644 -index 0000000..9a3c04e +index 000000000..9a3c04eb3 --- /dev/null +++ b/im/branding/messenger/content/aboutDialog.css @@ -0,0 +1,48 @@ @@ -2197,7 +2197,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/jar.mn b/im/branding/messenger/jar.mn new file mode 100644 -index 0000000..929e7c9 +index 000000000..929e7c998 --- /dev/null +++ b/im/branding/messenger/jar.mn @@ -0,0 +1,14 @@ @@ -2217,7 +2217,7 @@ index 0000000..929e7c9 + content/branding/about-wordmark.png (content/about-wordmark.png) diff --git a/im/branding/messenger/locales/en-US/brand.dtd b/im/branding/messenger/locales/en-US/brand.dtd new file mode 100644 -index 0000000..4dc69f2 +index 000000000..4dc69f244 --- /dev/null +++ b/im/branding/messenger/locales/en-US/brand.dtd @@ -0,0 +1,10 @@ @@ -2233,7 +2233,7 @@ index 0000000..4dc69f2 +<!ENTITY vendorShortName "Tor Project"> diff --git a/im/branding/messenger/locales/en-US/brand.properties b/im/branding/messenger/locales/en-US/brand.properties new file mode 100644 -index 0000000..c09000f +index 000000000..c09000fdb --- /dev/null +++ b/im/branding/messenger/locales/en-US/brand.properties @@ -0,0 +1,7 @@ @@ -2246,7 +2246,7 @@ index 0000000..c09000f +vendorShortName=Tor Project diff --git a/im/branding/messenger/locales/jar.mn b/im/branding/messenger/locales/jar.mn new file mode 100755 -index 0000000..4fb707f +index 000000000..4fb707f30 --- /dev/null +++ b/im/branding/messenger/locales/jar.mn @@ -0,0 +1,10 @@ @@ -2262,7 +2262,7 @@ index 0000000..4fb707f + locale/@AB_CD@/branding/brand.properties (%brand.properties) diff --git a/im/branding/messenger/locales/moz.build b/im/branding/messenger/locales/moz.build new file mode 100644 -index 0000000..e59008d +index 000000000..e59008d87 --- /dev/null +++ b/im/branding/messenger/locales/moz.build @@ -0,0 +1,8 @@ @@ -2276,7 +2276,7 @@ index 0000000..e59008d +DEFINES['MOZ_DISTRIBUTION_ID_UNQUOTED'] = CONFIG['MOZ_DISTRIBUTION_ID'] diff --git a/im/branding/messenger/moz.build b/im/branding/messenger/moz.build new file mode 100644 -index 0000000..bd8ad85 +index 000000000..bd8ad850b --- /dev/null +++ b/im/branding/messenger/moz.build @@ -0,0 +1,8 @@ @@ -2624,7 +2624,7 @@ HcmV?d00001 diff --git a/im/branding/messenger/mozicon16.xpm b/im/branding/messenger/mozicon16.xpm new file mode 100644 -index 0000000..3434739 +index 000000000..3434739f6 --- /dev/null +++ b/im/branding/messenger/mozicon16.xpm @@ -0,0 +1,193 @@ @@ -2823,7 +2823,7 @@ index 0000000..3434739 +}; diff --git a/im/branding/messenger/mozicon50.xpm b/im/branding/messenger/mozicon50.xpm new file mode 100644 -index 0000000..76e799c +index 000000000..76e799c60 --- /dev/null +++ b/im/branding/messenger/mozicon50.xpm @@ -0,0 +1,314 @@ @@ -3855,7 +3855,7 @@ HcmV?d00001 diff --git a/im/content/aboutDialog-appUpdater.js b/im/content/aboutDialog-appUpdater.js new file mode 100644 -index 0000000..f223f06 +index 000000000..f223f061e --- /dev/null +++ b/im/content/aboutDialog-appUpdater.js @@ -0,0 +1,576 @@ @@ -4436,7 +4436,7 @@ index 0000000..f223f06 + } +}; diff --git a/im/content/aboutDialog.css b/im/content/aboutDialog.css -index 2507060..a065c8e 100644 +index 25070608b..a065c8e88 100644 --- a/im/content/aboutDialog.css +++ b/im/content/aboutDialog.css @@ -1,66 +1,91 @@ @@ -4573,7 +4573,7 @@ index 2507060..a065c8e 100644 +} diff --git a/im/content/aboutDialog.js b/im/content/aboutDialog.js new file mode 100644 -index 0000000..e265f23 +index 000000000..e265f239c --- /dev/null +++ b/im/content/aboutDialog.js @@ -0,0 +1,80 @@ @@ -4658,7 +4658,7 @@ index 0000000..e265f23 + } +} diff --git a/im/content/aboutDialog.xul b/im/content/aboutDialog.xul -index aa3b80e..ba924b9 100644 +index aa3b80ec9..ba924b9ad 100644 --- a/im/content/aboutDialog.xul +++ b/im/content/aboutDialog.xul @@ -1,130 +1,173 @@ @@ -4944,7 +4944,7 @@ index aa3b80e..ba924b9 100644 +</window> diff --git a/im/content/browserMountPoints.inc b/im/content/browserMountPoints.inc new file mode 100644 -index 0000000..e4315b0 +index 000000000..e4315b04a --- /dev/null +++ b/im/content/browserMountPoints.inc @@ -0,0 +1,12 @@ @@ -4962,7 +4962,7 @@ index 0000000..e4315b0 +<menubar id="main-menubar"/> \ No newline at end of file diff --git a/im/content/jar.mn b/im/content/jar.mn -index 20ea9dc..b3d9e49 100644 +index 20ea9dce7..b3d9e492f 100644 --- a/im/content/jar.mn +++ b/im/content/jar.mn @@ -10,7 +10,8 @@ instantbird.jar: @@ -4976,7 +4976,7 @@ index 20ea9dc..b3d9e49 100644 content/instantbird/accounts.css content/instantbird/accounts.js diff --git a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd -index ecd8d9d..187cf5c 100644 +index ecd8d9d24..187cf5c3e 100644 --- a/im/locales/en-US/chrome/instantbird/aboutDialog.dtd +++ b/im/locales/en-US/chrome/instantbird/aboutDialog.dtd @@ -1,10 +1,129 @@ @@ -5120,7 +5120,7 @@ index ecd8d9d..187cf5c 100644 +<!ENTITY bottomLinks.license "Licensing Information"> +<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> diff --git a/im/locales/en-US/updater/updater.ini b/im/locales/en-US/updater/updater.ini -index 15ec569..4a2d35d 100644 +index 15ec569c1..4a2d35d8a 100644 --- a/im/locales/en-US/updater/updater.ini +++ b/im/locales/en-US/updater/updater.ini @@ -5,4 +5,4 @@ @@ -5130,5 +5130,5 @@ index 15ec569..4a2d35d 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch index a563ce0..3bac128 100644 --- a/projects/instantbird/0012-Account-picture.patch +++ b/projects/instantbird/0012-Account-picture.patch @@ -1,4 +1,4 @@ -From 2ce648e15ef32419459567cf44d928f09ff9f562 Mon Sep 17 00:00:00 2001 +From a8276a289236cd8691b6dece5e4e11d2de7f34b4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 12/25] Account picture @@ -8,7 +8,7 @@ Subject: [PATCH 12/25] Account picture 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/im/content/blist.xul b/im/content/blist.xul -index b90fdda..f29a48b 100644 +index b90fddadb..f29a48b99 100644 --- a/im/content/blist.xul +++ b/im/content/blist.xul @@ -114,8 +114,7 @@ @@ -22,5 +22,5 @@ index b90fdda..f29a48b 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch index 57218e3..e8ad5a3 100644 --- a/projects/instantbird/0013-Modify-protocol-defaults.patch +++ b/projects/instantbird/0013-Modify-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 57702ae527cd5b214f797731e9a1c7653096cb43 Mon Sep 17 00:00:00 2001 +From a10101ffc21977f256ee4ecb7f73af71ab5d7426 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:25:34 -0700 Subject: [PATCH 13/25] Modify protocol defaults @@ -12,7 +12,7 @@ Subject: [PATCH 13/25] Modify protocol defaults 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index 759f42b..a306906 100644 +index 759f42b38..a3069061a 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -50,7 +50,7 @@ @@ -25,7 +25,7 @@ index 759f42b..a306906 100644 </hbox> </wizardpage> diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index d552a23..7d371bd 100644 +index d552a232b..7d371bd21 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties @@ -8,11 +8,13 @@ @@ -44,5 +44,5 @@ index d552a23..7d371bd 100644 topProtocol.prpl-twitter.description=Stay up to date with your Twitter timeline topProtocol.prpl-aim.description=Chat with your buddies on AOL Instant Messenger -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch index 58860e9..92207a1 100644 --- a/projects/instantbird/0014-Modify-IRC-defaults.patch +++ b/projects/instantbird/0014-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 6de7f7d3d973a6bea2a35462720e30f76c5e3d1c Mon Sep 17 00:00:00 2001 +From aa70417e8646c50aa85598d723acd2099d524a1e Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 14/25] Modify IRC defaults @@ -14,7 +14,7 @@ Subject: [PATCH 14/25] Modify IRC defaults 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js -index 35165e9..c2167a5 100644 +index 35165e9a9..c2167a5ec 100644 --- a/chat/protocols/irc/irc.js +++ b/chat/protocols/irc/irc.js @@ -1931,7 +1931,7 @@ ircProtocol.prototype = { @@ -27,7 +27,7 @@ index 35165e9..c2167a5 100644 options: { diff --git a/chat/protocols/irc/ircCTCP.jsm b/chat/protocols/irc/ircCTCP.jsm -index 28eb374..120be10 100644 +index 28eb374f4..120be10ee 100644 --- a/chat/protocols/irc/ircCTCP.jsm +++ b/chat/protocols/irc/ircCTCP.jsm @@ -167,19 +167,7 @@ var ctcpBase = { @@ -61,5 +61,5 @@ index 28eb374..120be10 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch index d6f2472..9111fa7 100644 --- a/projects/instantbird/0015-Modify-themes.patch +++ b/projects/instantbird/0015-Modify-themes.patch @@ -1,4 +1,4 @@ -From 20f2987874fc704cb3ce5f342ab911538620ac68 Mon Sep 17 00:00:00 2001 +From b5c49b925dc1be8f8ae37e1f9f04c28020be7aa6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 15/25] Modify themes @@ -13,7 +13,7 @@ Subject: [PATCH 15/25] Modify themes 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -index a7e38bb..c5c781a 100644 +index a7e38bba4..c5c781a97 100644 --- a/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +++ b/im/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @@ -26,6 +26,8 @@ @@ -26,7 +26,7 @@ index a7e38bb..c5c781a 100644 <!-- EXTENSION AUTHORS! DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES diff --git a/im/content/preferences/themes.js b/im/content/preferences/themes.js -index 5c5d594..4a9d6af 100644 +index 5c5d594cb..4a9d6afd0 100644 --- a/im/content/preferences/themes.js +++ b/im/content/preferences/themes.js @@ -31,21 +31,6 @@ var gThemePane = { @@ -52,7 +52,7 @@ index 5c5d594..4a9d6af 100644 /* Create the drop down list for emoticons and messagestyles; diff --git a/im/content/preferences/themes.xul b/im/content/preferences/themes.xul -index 454e366..18ba1f9 100644 +index 454e36696..18ba1f95c 100644 --- a/im/content/preferences/themes.xul +++ b/im/content/preferences/themes.xul @@ -65,8 +65,6 @@ @@ -74,5 +74,5 @@ index 454e366..18ba1f9 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch index aad94d2..20a960c 100644 --- a/projects/instantbird/0016-Modify-XMPP-defaults.patch +++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch @@ -1,4 +1,4 @@ -From c326a8f3519d31ec6c1a2434a0ead4fa30d7aab0 Mon Sep 17 00:00:00 2001 +From 655f5e07585e180822e6a5a9d6d80f8cb1c4ab09 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:38:49 -0700 Subject: [PATCH 16/25] Modify XMPP defaults @@ -12,7 +12,7 @@ Subject: [PATCH 16/25] Modify XMPP defaults 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chat/protocols/gtalk/gtalk.js b/chat/protocols/gtalk/gtalk.js -index 8bce0c9..642f456 100644 +index 8bce0c9b4..642f4561d 100644 --- a/chat/protocols/gtalk/gtalk.js +++ b/chat/protocols/gtalk/gtalk.js @@ -96,7 +96,7 @@ GTalkProtocol.prototype = { @@ -25,7 +25,7 @@ index 8bce0c9..642f456 100644 get chatHasTopic() { return true; }, classID: Components.ID("{38a224c1-6748-49a9-8ab2-efc362b1000d}") diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js -index 265445a..a5635ca 100644 +index 265445a18..a5635cae3 100644 --- a/chat/protocols/xmpp/xmpp.js +++ b/chat/protocols/xmpp/xmpp.js @@ -31,12 +31,12 @@ XMPPProtocol.prototype = { @@ -44,5 +44,5 @@ index 265445a..a5635ca 100644 connection_security: { get label() { return _("options.connectionSecurity"); }, -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch index df865b8..6c4504e 100644 --- a/projects/instantbird/0017-Remove-logging-UI.patch +++ b/projects/instantbird/0017-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 3270c324549b70ae92a09b3c28ba84bfd65c61e0 Mon Sep 17 00:00:00 2001 +From cafc07fcac360ccd5248a6798dfb7706788fe4fe Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 17/25] Remove logging UI @@ -8,7 +8,7 @@ Subject: [PATCH 17/25] Remove logging UI 1 file changed, 20 deletions(-) diff --git a/im/content/preferences/privacy.xul b/im/content/preferences/privacy.xul -index 7c9db1c..2d7b270 100644 +index 7c9db1cdd..2d7b2701e 100644 --- a/im/content/preferences/privacy.xul +++ b/im/content/preferences/privacy.xul @@ -66,26 +66,6 @@ @@ -39,5 +39,5 @@ index 7c9db1c..2d7b270 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch index 2c7d611..c6b033a 100644 --- a/projects/instantbird/0018-Cert-override.patch +++ b/projects/instantbird/0018-Cert-override.patch @@ -1,4 +1,4 @@ -From ccf46a070de2d8bdf3edabbebd42bb8c5e55388f Mon Sep 17 00:00:00 2001 +From 20e5243b68e4ed887acee55954affdb33fbac423 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 18/25] Cert override @@ -13,7 +13,7 @@ Subject: [PATCH 18/25] Cert override diff --git a/im/app/profile/cert_override.txt b/im/app/profile/cert_override.txt new file mode 100644 -index 0000000..4e616f6 +index 000000000..4e616f6cf --- /dev/null +++ b/im/app/profile/cert_override.txt @@ -0,0 +1,3 @@ @@ -21,7 +21,7 @@ index 0000000..4e616f6 +# This is a generated file! Do not edit. +jabber.ccc.de:5222 OID.2.16.840.1.101.3.4.2.1 59:2F:46:18:35:27:AB:40:83:88:82:AB:4C:B4:AE:F4:E2:CF:91:60:74:AB:01:F9:BC:24:39:31:CA:5C:4E:D1 U AAAAAAAAAAAAAAADAAAAexFL3TB5MRAwDgYDVQQKEwdSb290IENBMR4wHAYDVQQL ExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNBIENlcnQgU2lnbmlu ZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRAY2FjZXJ0Lm9yZw== diff --git a/im/app/profile/moz.build b/im/app/profile/moz.build -index 46bc16b..b7d4ebd 100644 +index 46bc16bd1..b7d4ebd4b 100644 --- a/im/app/profile/moz.build +++ b/im/app/profile/moz.build @@ -9,6 +9,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'mac', 'cocoa'): @@ -33,7 +33,7 @@ index 46bc16b..b7d4ebd 100644 'mimeTypes.rdf', ] diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 25dd676..5f06e78 100644 +index 25dd67617..5f06e784c 100644 --- a/im/installer/Makefile.in +++ b/im/installer/Makefile.in @@ -109,7 +109,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns @@ -48,7 +48,7 @@ index 25dd676..5f06e78 100644 INSTALL_SDK = 1 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index 1174b3d..3e35a2e 100644 +index 1174b3dfd..3e35a2e1b 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in @@ -160,6 +160,7 @@ @@ -60,5 +60,5 @@ index 1174b3d..3e35a2e 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch index dfebfc0..90fa7fd 100644 --- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 86bdc8f65a2a8cc75c0b58b64f0edf3a98f1a5fd Mon Sep 17 00:00:00 2001 +From 9def66dc758ccdfb179d47b3b6cce29531a38018 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 19/25] Display all traffic over Tor @@ -9,7 +9,7 @@ Subject: [PATCH 19/25] Display all traffic over Tor 2 files changed, 3 insertions(+) diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul -index a306906..3c3a417 100644 +index a3069061a..3c3a4179b 100644 --- a/im/content/accountWizard.xul +++ b/im/content/accountWizard.xul @@ -39,6 +39,8 @@ @@ -22,7 +22,7 @@ index a306906..3c3a417 100644 <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername" diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.dtd b/im/locales/en-US/chrome/instantbird/accountWizard.dtd -index c46fb2f..6b49c84 100644 +index c46fb2f95..6b49c84fa 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.dtd +++ b/im/locales/en-US/chrome/instantbird/accountWizard.dtd @@ -6,6 +6,7 @@ @@ -34,5 +34,5 @@ index c46fb2f..6b49c84 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch index 488776c..7c52152 100644 --- a/projects/instantbird/0020-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From d8136d469553e45875c549cb94d9d6796f577968 Mon Sep 17 00:00:00 2001 +From 5f45a049d67f31ed6cc753ad539ddb9144ff7ddf Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 20/25] Trac 17480: Content sink @@ -9,7 +9,7 @@ Subject: [PATCH 20/25] Trac 17480: Content sink 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/chat/modules/imContentSink.jsm b/chat/modules/imContentSink.jsm -index abd95fc..fa32442 100644 +index abd95fc71..fa32442e4 100644 --- a/chat/modules/imContentSink.jsm +++ b/chat/modules/imContentSink.jsm @@ -42,7 +42,7 @@ this.EXPORTED_SYMBOLS = [ @@ -94,7 +94,7 @@ index abd95fc..fa32442 100644 return kModes[baseNum]; } diff --git a/im/content/preferences/content.xul b/im/content/preferences/content.xul -index 3b8ccfa..ba41da7 100644 +index 3b8ccfa2b..ba41da76a 100644 --- a/im/content/preferences/content.xul +++ b/im/content/preferences/content.xul @@ -35,7 +35,7 @@ @@ -107,5 +107,5 @@ index 3b8ccfa..ba41da7 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch index 7629d5b..dd6a659 100644 --- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From 2924c20a36d541422d95f05cfa5b078526363fae Mon Sep 17 00:00:00 2001 +From 049adcc7cc828fdb3e68467cc8acc57778f2deaf Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 21/25] SASL ECDSA-NIST256P-CHALLENGE @@ -12,7 +12,7 @@ Subject: [PATCH 21/25] SASL ECDSA-NIST256P-CHALLENGE create mode 100644 chat/protocols/irc/elliptic.jsm diff --git a/chat/components/src/imAccounts.js b/chat/components/src/imAccounts.js -index 5bfea57..da8525f 100644 +index 5bfea57f2..da8525ffd 100644 --- a/chat/components/src/imAccounts.js +++ b/chat/components/src/imAccounts.js @@ -193,6 +193,7 @@ function imAccount(aKey, aName, aPrplId) @@ -25,7 +25,7 @@ index 5bfea57..da8525f 100644 id: "", diff --git a/chat/protocols/irc/elliptic.jsm b/chat/protocols/irc/elliptic.jsm new file mode 100644 -index 0000000..bccab01 +index 000000000..bccab018c --- /dev/null +++ b/chat/protocols/irc/elliptic.jsm @@ -0,0 +1,8748 @@ @@ -8779,7 +8779,7 @@ index 0000000..bccab01 +var elliptic = window.elliptic; \ No newline at end of file diff --git a/chat/protocols/irc/ircSASL.jsm b/chat/protocols/irc/ircSASL.jsm -index 561f055..8a2bd70 100644 +index 561f055e0..8a2bd70aa 100644 --- a/chat/protocols/irc/ircSASL.jsm +++ b/chat/protocols/irc/ircSASL.jsm @@ -14,6 +14,43 @@ var Cu = Components.utils; @@ -8903,7 +8903,7 @@ index 561f055..8a2bd70 100644 return true; diff --git a/chat/protocols/irc/moz.build b/chat/protocols/irc/moz.build -index bc25396..e46815d 100644 +index bc2539687..e46815dfe 100644 --- a/chat/protocols/irc/moz.build +++ b/chat/protocols/irc/moz.build @@ -11,6 +11,7 @@ EXTRA_COMPONENTS += [ @@ -8915,5 +8915,5 @@ index bc25396..e46815d 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch index 8d181d1..d02fe5a 100644 --- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch +++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch @@ -1,4 +1,4 @@ -From 7e4e89fd1a5a14bf2b4afdc32a83e08f759244b9 Mon Sep 17 00:00:00 2001 +From 1ec3e4cd7e820648086460bfbadc26cf43e7945f Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Wed, 26 Oct 2016 20:16:58 +0200 Subject: [PATCH 22/25] Bug 1313137 - "msg is not defined" error in @@ -11,7 +11,7 @@ extra : rebase_source : 5752a69059ecd48b947809ef12de177ccab8528f 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js -index c2167a5..b58c2c2 100644 +index c2167a5ec..b58c2c2eb 100644 --- a/chat/protocols/irc/irc.js +++ b/chat/protocols/irc/irc.js @@ -1289,7 +1289,8 @@ ircAccount.prototype = { @@ -25,5 +25,5 @@ index c2167a5..b58c2c2 100644 }, -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch index c3335f0..9c3886a 100644 --- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch +++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch @@ -1,4 +1,4 @@ -From 0dc553e078f0d6f7c493baac6757b17bb6bf613b Mon Sep 17 00:00:00 2001 +From b7d7b3ed7b73f1b46a6334e3d358bace8228b732 Mon Sep 17 00:00:00 2001 From: aleth <aleth(a)instantbird.org> Date: Thu, 12 May 2016 15:10:43 +0200 Subject: [PATCH 23/25] Bug 954368 - Contact list entries should adapt their @@ -18,7 +18,7 @@ extra : rebase_source : 9820f3a68794f98260f3ac406772da6d176d02ec 8 files changed, 92 insertions(+), 53 deletions(-) diff --git a/chat/themes/imtooltip.css b/chat/themes/imtooltip.css -index c4525be..630da39 100644 +index c4525beb5..630da3983 100644 --- a/chat/themes/imtooltip.css +++ b/chat/themes/imtooltip.css @@ -31,6 +31,7 @@ @@ -30,7 +30,7 @@ index c4525be..630da39 100644 .tooltipDisplayName { diff --git a/im/content/blist.css b/im/content/blist.css -index d47e4f3..15b61b1 100644 +index d47e4f356..15b61b103 100644 --- a/im/content/blist.css +++ b/im/content/blist.css @@ -30,15 +30,28 @@ group { @@ -111,7 +111,7 @@ index d47e4f3..15b61b1 100644 -moz-binding: url("chrome://chat/content/imtooltip.xml#tooltip"); } diff --git a/im/content/blist.js b/im/content/blist.js -index 9ec10e2..ce76ffc 100644 +index 9ec10e25c..ce76ffcd7 100644 --- a/im/content/blist.js +++ b/im/content/blist.js @@ -820,6 +820,13 @@ var buddyList = { @@ -129,7 +129,7 @@ index 9ec10e2..ce76ffc 100644 blistBox.removeGroup = function(aGroupElt) { let index = buddyList._displayedGroups.indexOf(aGroupElt); diff --git a/im/content/blist.xul b/im/content/blist.xul -index f29a48b..71ee2c9 100644 +index f29a48b99..71ee2c9ef 100644 --- a/im/content/blist.xul +++ b/im/content/blist.xul @@ -224,6 +224,10 @@ @@ -144,7 +144,7 @@ index f29a48b..71ee2c9 100644 onclick='document.getElementById("buddylistbox").focus();'/> </notificationbox> diff --git a/im/content/contact.xml b/im/content/contact.xml -index 5fc36dd..f2b4641 100644 +index 5fc36dd6e..f2b464182 100644 --- a/im/content/contact.xml +++ b/im/content/contact.xml @@ -16,11 +16,11 @@ @@ -219,7 +219,7 @@ index 5fc36dd..f2b4641 100644 <children/> </xul:vbox> diff --git a/im/content/conv.xml b/im/content/conv.xml -index 96a33af..c41da6f 100644 +index 96a33af64..c41da6fb4 100644 --- a/im/content/conv.xml +++ b/im/content/conv.xml @@ -16,11 +16,11 @@ @@ -240,7 +240,7 @@ index 96a33af..c41da6f 100644 anonid="displayname" class="convDisplayName blistDisplayName" xbl:inherits="value=displayname,status"/> diff --git a/im/locales/en-US/chrome/instantbird/instantbird.dtd b/im/locales/en-US/chrome/instantbird/instantbird.dtd -index 80b8948..fce965b 100644 +index 80b894862..fce965bb1 100644 --- a/im/locales/en-US/chrome/instantbird/instantbird.dtd +++ b/im/locales/en-US/chrome/instantbird/instantbird.dtd @@ -95,6 +95,12 @@ @@ -257,7 +257,7 @@ index 80b8948..fce965b 100644 <!ENTITY openConversationCmd.label "Start a conversation"> <!ENTITY openConversationCmd.accesskey "c"> diff --git a/im/themes/blist.css b/im/themes/blist.css -index 9922674..c033b51 100644 +index 992267405..c033b51bc 100644 --- a/im/themes/blist.css +++ b/im/themes/blist.css @@ -100,14 +100,7 @@ group { @@ -318,5 +318,5 @@ index 9922674..c033b51 100644 min-width: 16px; } -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch index e176a3e..17f631d 100644 --- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch +++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch @@ -1,4 +1,4 @@ -From 995d262e94b51a893c40bcb20c7f92dbcb68bad7 Mon Sep 17 00:00:00 2001 +From 0331be740d906116cc07dceae0d6163442e4e844 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 5 Nov 2016 14:55:20 -0700 Subject: [PATCH 24/25] Bug 1187281 - Only show "close" button on Windows @@ -8,7 +8,7 @@ Subject: [PATCH 24/25] Bug 1187281 - Only show "close" button on Windows 1 file changed, 2 insertions(+) diff --git a/im/content/accounts.xul b/im/content/accounts.xul -index f3f1c6b..d683562 100644 +index f3f1c6bbb..d683562cb 100644 --- a/im/content/accounts.xul +++ b/im/content/accounts.xul @@ -142,6 +142,8 @@ @@ -21,5 +21,5 @@ index f3f1c6b..d683562 100644 </windowdragbox> </window> -- -2.10.2 +2.11.0 diff --git a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch index 26d7f65..4ba93ef 100644 --- a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch +++ b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch @@ -1,4 +1,4 @@ -From d63bca2d8110c2f0db343cee17e81ea6f5943020 Mon Sep 17 00:00:00 2001 +From 81b882c16f8216a889e1d6beb1035d8187a59df7 Mon Sep 17 00:00:00 2001 From: Patrick Cloke <clokep(a)gmail.com> Date: Wed, 9 Nov 2016 09:03:49 -0800 Subject: [PATCH 25/25] Bug 1316000 - Remove old Yahoo! Messenger support. @@ -28,7 +28,7 @@ Subject: [PATCH 25/25] Bug 1316000 - Remove old Yahoo! Messenger support. delete mode 100644 chat/protocols/yahoo/yahoo-session.jsm diff --git a/chat/chat-prefs.js b/chat/chat-prefs.js -index fb76916..60b9c1e 100644 +index fb769163d..60b9c1e8c 100644 --- a/chat/chat-prefs.js +++ b/chat/chat-prefs.js @@ -84,6 +84,8 @@ pref("chat.irc.automaticList", true); @@ -41,7 +41,7 @@ index fb76916..60b9c1e 100644 // loglevel is the minimum severity level that a libpurple message // must have to be reported in the Error Console. diff --git a/chat/locales/en-US/facebook.properties b/chat/locales/en-US/facebook.properties -index aaf7cdc..2e00cbc 100644 +index aaf7cdc9c..2e00cbcb2 100644 --- a/chat/locales/en-US/facebook.properties +++ b/chat/locales/en-US/facebook.properties @@ -2,6 +2,5 @@ @@ -53,7 +53,7 @@ index aaf7cdc..2e00cbc 100644 facebook.chat.name=Facebook Chat +facebook.disabled=Facebook Chat is no longer supported due to Facebook disabling their XMPP gateway. diff --git a/chat/locales/en-US/yahoo.properties b/chat/locales/en-US/yahoo.properties -index 727faa6..89ee009 100644 +index 727faa6ee..89ee0093c 100644 --- a/chat/locales/en-US/yahoo.properties +++ b/chat/locales/en-US/yahoo.properties @@ -2,36 +2,4 @@ @@ -95,7 +95,7 @@ index 727faa6..89ee009 100644 -command.feedback.invite=You have invited %S to the conference. +yahoo.disabled=Yahoo Messenger is no longer supported due to Yahoo disabling their legacy protocol. diff --git a/chat/protocols/facebook/facebook.js b/chat/protocols/facebook/facebook.js -index 7b5b3b8..9d90eac 100644 +index 7b5b3b86e..9d90eacdb 100644 --- a/chat/protocols/facebook/facebook.js +++ b/chat/protocols/facebook/facebook.js @@ -6,33 +6,26 @@ var {interfaces: Ci, utils: Cu} = Components; @@ -136,7 +136,7 @@ index 7b5b3b8..9d90eac 100644 __proto__: GenericProtocolPrototype, get normalizedName() { return "facebook"; }, diff --git a/chat/protocols/yahoo/moz.build b/chat/protocols/yahoo/moz.build -index f144347..ea37853 100644 +index f14434732..ea378535a 100644 --- a/chat/protocols/yahoo/moz.build +++ b/chat/protocols/yahoo/moz.build @@ -3,15 +3,9 @@ @@ -157,7 +157,7 @@ index f144347..ea37853 100644 JAR_MANIFESTS += ['jar.mn'] diff --git a/chat/protocols/yahoo/test/test_yahooAccount.js b/chat/protocols/yahoo/test/test_yahooAccount.js deleted file mode 100644 -index 51df00b..0000000 +index 51df00bb9..000000000 --- a/chat/protocols/yahoo/test/test_yahooAccount.js +++ /dev/null @@ -1,98 +0,0 @@ @@ -261,7 +261,7 @@ index 51df00b..0000000 -} diff --git a/chat/protocols/yahoo/test/test_yahooLoginHelper.js b/chat/protocols/yahoo/test/test_yahooLoginHelper.js deleted file mode 100644 -index e4d8bc1..0000000 +index e4d8bc1b8..000000000 --- a/chat/protocols/yahoo/test/test_yahooLoginHelper.js +++ /dev/null @@ -1,89 +0,0 @@ @@ -356,7 +356,7 @@ index e4d8bc1..0000000 -} diff --git a/chat/protocols/yahoo/test/test_yahoopacket.js b/chat/protocols/yahoo/test/test_yahoopacket.js deleted file mode 100644 -index 7908c44..0000000 +index 7908c4429..000000000 --- a/chat/protocols/yahoo/test/test_yahoopacket.js +++ /dev/null @@ -1,217 +0,0 @@ @@ -579,7 +579,7 @@ index 7908c44..0000000 -} diff --git a/chat/protocols/yahoo/test/xpcshell.ini b/chat/protocols/yahoo/test/xpcshell.ini deleted file mode 100644 -index f4b464e..0000000 +index f4b464e61..000000000 --- a/chat/protocols/yahoo/test/xpcshell.ini +++ /dev/null @@ -1,7 +0,0 @@ @@ -592,7 +592,7 @@ index f4b464e..0000000 -[test_yahoopacket.js] diff --git a/chat/protocols/yahoo/yahoo-session.jsm b/chat/protocols/yahoo/yahoo-session.jsm deleted file mode 100644 -index cc96120..0000000 +index cc9612036..000000000 --- a/chat/protocols/yahoo/yahoo-session.jsm +++ /dev/null @@ -1,1156 +0,0 @@ @@ -1753,7 +1753,7 @@ index cc96120..0000000 - } -}; diff --git a/chat/protocols/yahoo/yahoo.js b/chat/protocols/yahoo/yahoo.js -index 8beadb5..86a2589 100644 +index 8beadb504..86a258969 100644 --- a/chat/protocols/yahoo/yahoo.js +++ b/chat/protocols/yahoo/yahoo.js @@ -2,575 +2,39 @@ @@ -2341,7 +2341,7 @@ index 8beadb5..86a2589 100644 classID: Components.ID("{50ea817e-5d79-4657-91ae-aa0a52bdb98c}") }; diff --git a/im/content/conversation.xml b/im/content/conversation.xml -index 6f00c8d..c93dab0 100644 +index 6f00c8d39..c93dab00f 100644 --- a/im/content/conversation.xml +++ b/im/content/conversation.xml @@ -342,8 +342,7 @@ @@ -2355,7 +2355,7 @@ index 6f00c8d..c93dab0 100644 if ("color" in style) styleAttributes += " color=\"" + style.color + "\""; diff --git a/im/locales/en-US/chrome/instantbird/accountWizard.properties b/im/locales/en-US/chrome/instantbird/accountWizard.properties -index 7d371bd..1d6fd48 100644 +index 7d371bd21..1d6fd48e1 100644 --- a/im/locales/en-US/chrome/instantbird/accountWizard.properties +++ b/im/locales/en-US/chrome/instantbird/accountWizard.properties @@ -14,9 +14,8 @@ topProtocol.list=prpl-irc,prpl-jabber,prpl-twitter,prpl-gtalk @@ -2370,7 +2370,7 @@ index 7d371bd..1d6fd48 100644 topProtocol.prpl-irc.description=Join IRC channels +topProtocol.prpl-jabber.description=Chat using the open Jabber/XMPP protocol diff --git a/im/test/xpcshell.ini b/im/test/xpcshell.ini -index 5f7dd70..578122a 100644 +index 5f7dd70fc..578122a2a 100644 --- a/im/test/xpcshell.ini +++ b/im/test/xpcshell.ini @@ -6,5 +6,4 @@ @@ -2380,7 +2380,7 @@ index 5f7dd70..578122a 100644 -[include:chat/protocols/yahoo/test/xpcshell.ini] #[include:extensions/purple/purplexpcom/src/test/xpcshell.ini] diff --git a/mail/components/im/content/imconversation.xml b/mail/components/im/content/imconversation.xml -index 16c665a..a4b9fc6 100644 +index 16c665ab4..a4b9fc638 100644 --- a/mail/components/im/content/imconversation.xml +++ b/mail/components/im/content/imconversation.xml @@ -285,8 +285,7 @@ @@ -2394,5 +2394,5 @@ index 16c665a..a4b9fc6 100644 if ("color" in style) styleAttributes += " color=\"" + style.color + "\""; -- -2.10.2 +2.11.0

1 0

[tor/maint-0.2.8] Bump to 0.2.8.10
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 9157405c03f17635d80019eaf243388fb29df9dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:34:21 2016 -0500 Bump to 0.2.8.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6647523..eb1fac3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.9-dev]) +AC_INIT([tor],[0.2.8.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4a4bc9b..93e9516 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.9-dev" +!define VERSION "0.2.8.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 689f36e..0a3d77a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.9-dev" +#define VERSION "0.2.8.10"

1 0

[tor/release-0.2.8] Bump to 0.2.8.10
by nickm＠torproject.org 01 Dec '16

01 Dec '16

commit 9157405c03f17635d80019eaf243388fb29df9dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 1 13:34:21 2016 -0500 Bump to 0.2.8.10 --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 6647523..eb1fac3 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.2.8.9-dev]) +AC_INIT([tor],[0.2.8.10]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 4a4bc9b..93e9516 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.8.9-dev" +!define VERSION "0.2.8.10" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 689f36e..0a3d77a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -229,7 +229,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.8.9-dev" +#define VERSION "0.2.8.10"

1 0