October 2017 - tor-commits - lists.torproject.org

[torspec/master] Clarify a bit harder
by nickm＠torproject.org 10 Oct '17

10 Oct '17

commit 4e0dbd1081c2956a268e6982829b5cc8fda8de53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 10 14:29:12 2017 -0400 Clarify a bit harder --- dir-spec.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index d4245ce..76e42f9 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -615,7 +615,7 @@ "bridge-distribution-request" SP Method NL - [At most once] + [At most once, bridges only.] The "Method" describes how a Bridge address is distributed by BridgeDB. Recognized methods are: "none", "any", "https", "email", @@ -636,6 +636,9 @@ Potential future "Method" specifiers must be as follows: Method = (KeywordChar | "_") + + All bridges SHOULD include this line. Non-bridges MUST NOT include + it. (It is not currently implemented, or obeyed by Bridge DB.) + (Default: "any") "family" names NL

1 0

[torspec/master] dir-spec: Revise specification for "bridge-distribution-request" lines.
by nickm＠torproject.org 10 Oct '17

10 Oct '17

commit 4f6ab8d506b0a2716aa8269aaa89652e251d27ad Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon May 15 22:36:35 2017 +0000 dir-spec: Revise specification for "bridge-distribution-request" lines. * FIXES part of #18329 --- dir-spec.txt | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index dac94dc..2b61a4a 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -608,13 +608,30 @@ Describes a way to contact the relay's administrator, preferably including an email address and a PGP key fingerprint. - "bridge-distribution-request" SP info NL + "bridge-distribution-request" SP Method NL - [At most once] + [At most once] - "info" describes how a Bridge address is distributed by BridgeDB. If - set to "none", BridgeDB will avoid distributing your bridge address. - The other possible options are specified in the BridgeDB documentation. + The "Method" describes how a Bridge address is distributed by + BridgeDB. Recognized methods are: "none", "any", "https", "email", + "moat", "hyphae". If set to "none", BridgeDB will avoid distributing + your bridge address. If set to "any", BridgeDB will choose how to + distribute your bridge address. Choosing any of the other methods will + tell BridgeDB to distribute your bridge via a specific method: + + - "https" specifies distribution via the web interface at + https://bridges.torproject.org; + - "email" specifies distribution via the email autoresponder at + bridges(a)torproject.org; + - "moat" specifies distribution via an interactive menu inside Tor + Browser; and + - "hyphae" specifies distribution via a cryptographically-secure, + invitation-based system. + + Potential future "Method" specifiers must be as follows: + Method = (KeywordChar | "_") + + + (Default: "any") "family" names NL

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23757'
by nickm＠torproject.org 10 Oct '17

10 Oct '17

commit 22139c0b285e32639b35d671bef12277d3441791 Merge: d9321d697 3ae5b32aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 10 14:09:49 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug23757' .gitlab-ci.yml | 16 ++++++++++------ changes/bug23757 | 4 ++++ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/master] Match .travis.yml more closely
by nickm＠torproject.org 10 Oct '17

10 Oct '17

commit 3ae5b32aaa291da6cdcfa7ccb19fdc830bc956d1 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Oct 4 09:45:21 2017 -0500 Match .travis.yml more closely Adjust the GitLab CI configuration to more closely match that of Travis CI. Fixes bug 23757. --- .gitlab-ci.yml | 16 ++++++++++------ changes/bug23757 | 4 ++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 969646b98..ba981d5f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,17 @@ before_script: - - "apt-get update -qq" - - "apt-get upgrade -y" + - apt-get update -qq + - apt-get upgrade -qy build: script: - - "apt-get install -y --fix-missing git openssh-client asciidoc wget gcc g++ automake cmake make libglib2.0 libglib2.0-dev libigraph0 libigraph0-dev libevent-dev openssl libssl-dev" - - "sh autogen.sh && ./configure && make" - - "make check" - - "make install" + - apt-get install -qy --fix-missing automake build-essential + libevent-dev libssl-dev zlib1g-dev + libseccomp-dev liblzma-dev libscrypt-dev + - ./autogen.sh + - ./configure --disable-asciidoc --enable-fatal-warnings + --disable-silent-rules + - make check || (e=$?; cat test-suite.log; exit $e) + - make install update: only: diff --git a/changes/bug23757 b/changes/bug23757 new file mode 100644 index 000000000..02507a0b4 --- /dev/null +++ b/changes/bug23757 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Adjust the GitLab CI configuration to more closely match that of Travis + CI. Fixes bug 23757; bugfix on 0.3.2.2-alpha. +

1 0

[tor/master] Only run "update" job from scheduled pipelines
by nickm＠torproject.org 10 Oct '17

10 Oct '17

commit d5d811e2d08beca0b6029cfab50201966335f976 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Oct 4 09:40:04 2017 -0500 Only run "update" job from scheduled pipelines Stop attempting to unconditionally mirror the tor repository in GitLab CI. This prevented developers from enabling GitLab CI on master because the "update" job would attempt to run, causing an unuseful CI failure. Fixes bug 23755. --- .gitlab-ci.yml | 4 +++- changes/bug23755 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78a1b0e7e..969646b98 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,8 @@ build: - "make install" update: + only: + - schedules script: - "apt-get install -y --fix-missing git openssh-client" @@ -36,4 +38,4 @@ update: - "mkdir tor" - "cd tor" - git clone --bare https://git.torproject.org/tor.git - - git push --mirror git@oniongit.eu:network/tor.git \ No newline at end of file + - git push --mirror git@oniongit.eu:network/tor.git diff --git a/changes/bug23755 b/changes/bug23755 new file mode 100644 index 000000000..98f097034 --- /dev/null +++ b/changes/bug23755 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Stop unconditionally mirroring the tor repository in GitLab CI. + This prevented developers from enabling GitLab CI on master. + Fixes bug 23755; bugfix on 0.3.2.2-alpha.

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23755'
by nickm＠torproject.org 10 Oct '17

10 Oct '17

commit d9321d697d8ac01284a07ac9651bbfa4030f96e6 Merge: 51e47481f d5d811e2d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 10 14:07:34 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug23755' .gitlab-ci.yml | 4 +++- changes/bug23755 | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-)

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 10 Oct '17

10 Oct '17

commit 8ee8d6dff14e6ee2ce6a45a3f937808df0a31602 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 17:49:07 2017 +0000 Update translations for tails-onioncircuits --- my/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my/onioncircuits.pot b/my/onioncircuits.pot index 613d7e722..58e076605 100644 --- a/my/onioncircuits.pot +++ b/my/onioncircuits.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2017-09-22 21:53+0000\n" +"PO-Revision-Date: 2017-10-10 17:31+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n" "MIME-Version: 1.0\n"

1 0

[stem/master] Parse bridge-distribution-request in server descriptors
by atagar＠torproject.org 10 Oct '17

10 Oct '17

commit 3eb59411781c4fa210979cb112b800c001a59f6c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 10 09:38:43 2017 -0700 Parse bridge-distribution-request in server descriptors Bending my usual policy of only adding parsing support once fields are in the spec due to an amusing circular dependency... https://trac.torproject.org/projects/tor/ticket/21177#comment:5 --- docs/change_log.rst | 1 + stem/descriptor/server_descriptor.py | 35 ++++++++++++++++++++++++++++++- test/unit/descriptor/server_descriptor.py | 14 ++++++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6e4bcbc6..012b544d 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -75,6 +75,7 @@ The following are only available within Stem's `git repository * Sped descriptor reading by ~25% by deferring defaulting when validating * Added server descriptor's new extra_info_sha256_digest attribute (:spec:`0f03581`) * Added server descriptor's new protocol attribute (:spec:`eb4fb3c`) + * Added server descriptor's new bridge_distribution attribute (:trac:`21177`) * Added extrainfo descriptor's new padding_counts attributes (:spec:`0803997`) * Shared randomness properties weren't being read in votes (:trac:`21102`) * Updated longclaw authority's address (:trac:`23592`) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 8489b332..cfb3f710 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -29,6 +29,22 @@ etc). This information is provided from a few sources... |- digest - calculates the upper-case hex digest value for our content |- get_annotations - dictionary of content prior to the descriptor entry +- get_annotation_lines - lines that provided the annotations + +.. data:: BridgeDistribution (enum) + + Preferred method of distributing this relay if a bridge. + + .. versionadded:: 1.6.0 + + ===================== =========== + BridgeDistribution Description + ===================== =========== + **ANY** No proference, BridgeDB will pick how the bridge is distributed. + **HTTPS** Provided via the `web interface <https://bridges.torproject.org>`_. + **EMAIL** Provided in response to emails to bridges(a)torproject.org. + **MOAT** Provided in interactive menus within Tor Browser. + **HYPHAE** Provided via a cryptographic invitation-based system. + ===================== =========== """ import base64 @@ -42,6 +58,7 @@ import stem.descriptor.extrainfo_descriptor import stem.exit_policy import stem.prereq import stem.util.connection +import stem.util.enum import stem.util.str_tools import stem.util.tor_tools import stem.version @@ -101,6 +118,7 @@ SINGLE_FIELDS = ( 'read-history', 'write-history', 'eventdns', + 'bridge-distribution-request', 'family', 'caches-extra-info', 'extra-info-digest', @@ -115,8 +133,17 @@ SINGLE_FIELDS = ( 'router-sig-ed25519', ) +BridgeDistribution = stem.util.enum.Enum( + ('ANY', 'any'), + ('HTTPS', 'https'), + ('EMAIL', 'email'), + ('MOAT', 'moat'), + ('HYPHAE', 'hyphae'), +) + DEFAULT_IPV6_EXIT_POLICY = stem.exit_policy.MicroExitPolicy('reject 1-65535') REJECT_ALL_POLICY = stem.exit_policy.ExitPolicy('reject *:*') +DEFAULT_BRIDGE_DISTRIBUTION = 'any' def _truncated_b64encode(content): @@ -423,6 +450,7 @@ _parse_allow_single_hop_exits_line = _parse_if_present('allow-single-hop-exits', _parse_tunneled_dir_server_line = _parse_if_present('tunnelled-dir-server', 'allow_tunneled_dir_requests') _parse_proto_line = _parse_protocol_line('proto', 'protocols') _parse_caches_extra_info_line = _parse_if_present('caches-extra-info', 'extra_info_cache') +_parse_bridge_distribution_request_line = _parse_simple_line('bridge-distribution-request', 'bridge_distribution') _parse_family_line = _parse_simple_line('family', 'family', func = lambda v: set(v.split(' '))) _parse_eventdns_line = _parse_simple_line('eventdns', 'eventdns', func = lambda v: v == '1') _parse_onion_key_line = _parse_key_block('onion-key', 'onion_key', 'RSA PUBLIC KEY') @@ -456,6 +484,8 @@ class ServerDescriptor(Descriptor): :var bytes contact: contact information :var stem.exit_policy.ExitPolicy exit_policy: **\*** stated exit policy :var stem.exit_policy.MicroExitPolicy exit_policy_v6: **\*** exit policy for IPv6 + :var BridgeDistribution bridge_distribution: **\*** preferred method of providing this relay's + address if a bridge :var set family: **\*** nicknames or fingerprints of declared family :var int average_bandwidth: **\*** average rate it's willing to relay in bytes/s @@ -495,7 +525,8 @@ class ServerDescriptor(Descriptor): Added the allow_tunneled_dir_requests attribute. .. versionchanged:: 1.6.0 - Added the extra_info_sha256_digest and protocols attributes. + Added the extra_info_sha256_digest, protocols, and bridge_distribution + attributes. """ ATTRIBUTES = { @@ -515,6 +546,7 @@ class ServerDescriptor(Descriptor): 'operating_system': (None, _parse_platform_line), 'uptime': (None, _parse_uptime_line), 'exit_policy_v6': (DEFAULT_IPV6_EXIT_POLICY, _parse_ipv6_policy_line), + 'bridge_distribution': (DEFAULT_BRIDGE_DISTRIBUTION, _parse_bridge_distribution_request_line), 'family': (set(), _parse_family_line), 'average_bandwidth': (None, _parse_bandwidth_line), @@ -565,6 +597,7 @@ class ServerDescriptor(Descriptor): 'tunnelled-dir-server': _parse_tunneled_dir_server_line, 'proto': _parse_proto_line, 'caches-extra-info': _parse_caches_extra_info_line, + 'bridge-distribution-request': _parse_bridge_distribution_request_line, 'family': _parse_family_line, 'eventdns': _parse_eventdns_line, } diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 7bf0b2cf..f392b44f 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -21,7 +21,7 @@ import test.require from stem.util import str_type from stem.descriptor.certificate import CertType, ExtensionType -from stem.descriptor.server_descriptor import RelayDescriptor, BridgeDescriptor +from stem.descriptor.server_descriptor import BridgeDistribution, RelayDescriptor, BridgeDescriptor from test.unit.descriptor import ( get_resource, @@ -141,6 +141,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual('D225B728768D7EA4B5587C13A7A9D22EBBEE6E66', desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) self.assertEqual(['2'], desc.hidden_service_dir) + self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(expected_family, desc.family) self.assertEqual(153600, desc.average_bandwidth) self.assertEqual(256000, desc.burst_bandwidth) @@ -200,6 +201,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(None, desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) self.assertEqual(None, desc.hidden_service_dir) + self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(set(), desc.family) self.assertEqual(102400, desc.average_bandwidth) self.assertEqual(10485760, desc.burst_bandwidth) @@ -248,6 +250,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual('56403D838DE152421CD401B8E57DAD4483A3D56B', desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) self.assertEqual(['2'], desc.hidden_service_dir) + self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(set(), desc.family) self.assertEqual(102400, desc.average_bandwidth) self.assertEqual(204800, desc.burst_bandwidth) @@ -504,6 +507,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual('BB1F13AA431421BEA29B840A2E33BB1C31C2990B', desc.extra_info_digest) self.assertEqual(None, desc.extra_info_sha256_digest) self.assertEqual(None, desc.hidden_service_dir) + self.assertEqual(BridgeDistribution.ANY, desc.bridge_distribution) self.assertEqual(set(), desc.family) self.assertEqual(3220480, desc.average_bandwidth) self.assertEqual(6441984, desc.burst_bandwidth) @@ -753,6 +757,14 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= fingerprint = '4F0C 867D F0EF 6816 0568 C826 838F 482C EA7C FE45' expect_invalid_attr(self, {'opt fingerprint': fingerprint}, 'fingerprint', fingerprint.replace(' ', '')) + def test_with_bridge_distribution(self): + """ + Include a preferred method of bridge distribution. + """ + + desc = RelayDescriptor.create({'bridge-distribution-request': 'email'}) + self.assertEqual(BridgeDistribution.EMAIL, desc.bridge_distribution) + def test_ipv6_policy(self): """ Checks a 'ipv6-policy' line.

1 0

[tor-messenger-build/master] Update to ESR 52.4.0
by arlo＠torproject.org 10 Oct '17

10 Oct '17

commit 80f161a095d6b2347bb066c53136f407a2aed2e2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Oct 10 12:24:18 2017 -0400 Update to ESR 52.4.0 --- ChangeLog | 4 ++++ .../0001-Set-Tor-Messenger-preferences.patch | 22 ++++++++++++++++------ ...c-21634-Autologin-default-should-be-false.patch | 4 ++-- .../0003-XMPP-in-band-registration.patch | 4 ++-- .../instantbird/0004-Remove-search-from-UI.patch | 4 ++-- .../0005-Add-Tor-Messenger-branding.patch | 4 ++-- ...ve-option-for-configuring-account-picture.patch | 4 ++-- .../0007-Modify-top-protocol-defaults.patch | 4 ++-- .../instantbird/0008-Modify-IRC-defaults.patch | 4 ++-- .../0009-Do-not-set-default-XMPP-server.patch | 4 ++-- projects/instantbird/0010-Modify-themes.patch | 4 ++-- projects/instantbird/0011-Remove-logging-UI.patch | 4 ++-- projects/instantbird/0012-Cert-override.patch | 4 ++-- .../0013-Display-all-traffic-over-Tor.patch | 4 ++-- .../instantbird/0014-Trac-17480-Content-sink.patch | 4 ++-- .../0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 ++-- ...-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- ...517-Use-different-color-for-Add-Exception.patch | 4 ++-- ...21736-Hide-account-timestamp-from-message.patch | 6 +++--- ...wed-duplicated-files-for-Windows-and-Linu.patch | 4 ++-- ...g-13855-Use-known-onions-for-XMPP-servers.patch | 4 ++-- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 4 ++-- projects/instantbird/config | 2 +- ...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- .../mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- projects/mozilla/0003-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0004-Updater-fixups-for-TM.patch | 4 ++-- ...ing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- tor-browser-build | 2 +- 31 files changed, 76 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0da311..634af73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Tor Messenger 0.5.0b2 -- * All Platforms + * Use the tor-browser-52.4.0esr-7.0-1-build1 tag on tor-browser + * Use the THUNDERBIRD_52_4_0_RELEASE tag on comm-esr52 + * Update tor-browser to 7.0.6 + * Update tor-browser-build to 8c4c05d * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index d215552..a62853e 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,14 +1,14 @@ -From 3aef7c8034e706afa8f0b3e31ecd03c8f9017ab4 Mon Sep 17 00:00:00 2001 +From 1a419b902c5fc2d07e880fa13666fddf70100093 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences --- - im/app/profile/all-instantbird.js | 458 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 434 insertions(+), 24 deletions(-) + im/app/profile/all-instantbird.js | 468 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 444 insertions(+), 24 deletions(-) diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 127c86a662..31b3744c63 100644 +index 127c86a662..3a5f63909e 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -1,3 +1,56 @@ @@ -198,7 +198,7 @@ index 127c86a662..31b3744c63 100644 pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); -@@ -337,4 +387,364 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU +@@ -337,4 +387,374 @@ pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU pref("chat.prpls.forcePurple", ""); // Whether to parse log files for conversation statistics. @@ -420,6 +420,9 @@ index 127c86a662..31b3744c63 100644 +pref("network.protocol-handler.warn-external.news", true); +pref("network.protocol-handler.warn-external.nntp", true); +pref("network.protocol-handler.warn-external.snews", true); ++// Make sure we don't have any GIO supported protocols (defense in depth ++// measure) ++pref("network.gio.supported-protocols", ""); +pref("plugin.disable", true); // Disable to search plugins on first start +//pref("plugins.click_to_play", true); // TM +//pref("plugin.state.flash", 1); // TM @@ -504,6 +507,10 @@ index 127c86a662..31b3744c63 100644 +pref("extensions.pendingOperations", false); +pref("xpinstall.whitelist.add", ""); +pref("xpinstall.whitelist.add.36", ""); ++// We don't know what extensions Mozilla is advertising to our users and we ++// don't want to have some random Google Analytics script running either on the ++// about:addons page, see bug 22073 and 22900. ++pref("extensions.getAddons.showPane", false); + +// Toolbar layout +pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"loop-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":4,\"newElementCount\":0}"); @@ -561,9 +568,12 @@ index 127c86a662..31b3744c63 100644 +// in case the download panel got removed from the toolbar. +pref("browser.download.panel.shown", true); + ++// Treat .onions as secure ++pref("dom.securecontext.whitelist_onions", true); ++ +#ifdef TOR_BROWSER_VERSION +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index 8d06c52..79c7728 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From ab5dabcf6221b83733482587c6ccdb3975b30b46 Mon Sep 17 00:00:00 2001 +From 91062162469ca90684b78e420c8bb5e178de3b63 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/22] Trac 21634: Autologin default should be false @@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644 </wizard> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 5b1fd6d..68aaea8 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 313ff42077e8a6aa6ca8acf9a659d991af64bdc3 Mon Sep 17 00:00:00 2001 +From 249a20eedb778a0cd3917a6c414f5c1029d84051 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration @@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index 3459d6c..7ab2b82 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 5b47b35c62fe57b4e37b75efd9e116d6995c0b88 Mon Sep 17 00:00:00 2001 +From bc892e8e51fb9d7a43d52f7a6a15fcbd3efee73b 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 04/22] Remove search from UI @@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 85aca2d..f4cf2df 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 38fa4bd0401bc9dbcba80a7fb1d51456dae0e3b1 Mon Sep 17 00:00:00 2001 +From f26c44cebb6b2b3d6300a91413b363c04fc3d74a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding @@ -5121,5 +5121,5 @@ index 15ec569c11..4a2d35d8a1 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.14.1 +2.14.2 diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index b69798e..6faad85 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From ca63ac2fee5d1cd4c07385c27951336ca044e0f1 Mon Sep 17 00:00:00 2001 +From 9ee2a5b30901e57d10faeb23a7fbea9ffc6ddbf1 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 06/22] Remove option for configuring account picture @@ -22,5 +22,5 @@ index 843f1eef57..71ee2c9ef8 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 4cf2462..c69f058 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 293de6a98f59314906fb493931e4da08c145edb9 Mon Sep 17 00:00:00 2001 +From 1a168f96d38212aa4b7429abaa00954530e492cc Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults @@ -21,5 +21,5 @@ index 135b68386c..356321dbcc 100644 </hbox> </wizardpage> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 41d227d..5ec0466 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 5c4c225ebc5b63e6a4701bfa52857caf2ab0461d Mon Sep 17 00:00:00 2001 +From bd964173ba0c6cca95de9c51baec230c7e40b1fb 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 08/22] Modify IRC defaults @@ -61,5 +61,5 @@ index 43ed2ced4b..c2f16bee84 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index 6ab40d6..85e32b4 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From 3a7c66ba02524914d909b32ce716586f775aaeca Mon Sep 17 00:00:00 2001 +From f573a42e2d1ea02776edee2ade03e63bb6388e3a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server @@ -21,5 +21,5 @@ index 2afb15f059..1d2c167d3e 100644 options: { -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index d12c3c5..0e2ad48 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From 466f8a545201f58e72d43bcf602251ab619fc189 Mon Sep 17 00:00:00 2001 +From efabf635d682d4eea8a3329d71df014214d247ba 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 10/22] Modify themes @@ -74,5 +74,5 @@ index 454e366960..18ba1f95cc 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 33e6dc9..1f2aab4 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 5951a00ada2bbc5dbf61b71ab339dc68646892fe Mon Sep 17 00:00:00 2001 +From 371b52940173e9fd2fe85ac2ca5ef9f03d371e11 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 11/22] Remove logging UI @@ -39,5 +39,5 @@ index 7c9db1cdd8..2d7b2701ea 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index fe65ceb..d4370df 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 015feb4d96762ffb6705091ef2713178702dcde2 Mon Sep 17 00:00:00 2001 +From 0774d5ed349bf900a96a9e13bcf9687c7d70368f 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 12/22] Cert override @@ -60,5 +60,5 @@ index def78c809c..614d52bca2 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index ffb6867..c5e42ac 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From ccb6940299d87e001b392c10d028dfc3ac5b9516 Mon Sep 17 00:00:00 2001 +From 7efeac31a408d2aa0b80597d2609897406469103 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 13/22] Display all traffic over Tor @@ -34,5 +34,5 @@ index c46fb2f956..6b49c84fad 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 3788ef7..5b8632d 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From c8670c32a866081764149bf3fd6670192994d401 Mon Sep 17 00:00:00 2001 +From c69ef4b466ab631fadfad9026c574bd036eedfba 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 14/22] Trac 17480: Content sink @@ -107,5 +107,5 @@ index 3b8ccfa2b3..ba41da76aa 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 140d522..01fca27 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From ab0108edfd75b2f4741cf0080113887d697ddf4b Mon Sep 17 00:00:00 2001 +From 94555d7b82f8bc5cf31446c574a1abc711838368 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 15/22] SASL ECDSA-NIST256P-CHALLENGE @@ -8915,5 +8915,5 @@ index bc25396873..e46815dfe3 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index fe55d6e..5e1b677 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From 5589e17c4747a3c30edc3e5a980f80abac92c744 Mon Sep 17 00:00:00 2001 +From e9d61cdc4d05ea2def1f270f8a7b5ea5dc520656 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 80421b8ca2..6520757ddd 100644 .indicator { -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index 1aee3e1..5b392f0 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From 75a58323c2964b36b0409a37249473f0ff39b803 Mon Sep 17 00:00:00 2001 +From ce279ac901dfdebc18a380a1011457f5c62f336c Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in @@ -48,5 +48,5 @@ index c52c8c637d..0069219fa6 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index 370d12e..6d709c4 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From baeb48bfa3e1185a533b3576c6c1afd653d963cf Mon Sep 17 00:00:00 2001 +From 04752e3d48bf46acf925e2d7d160803ddd44995b Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception @@ -19,5 +19,5 @@ index 807184209b..8ce7f9ad81 100644 + color: #fff; +} -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index ea7c3d9..cd8ef86 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From 1f7835fa96fb79e580ff76508bdebe6fe294f101 Mon Sep 17 00:00:00 2001 +From ba99bf085d2243a42b3254ef6a72b0124fec89f6 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -44,7 +44,7 @@ index a723d742bf..95d917f0d7 100644 } diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js -index 31b3744c63..98e1a7b929 100644 +index 3a5f63909e..7d7c97aa07 100644 --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js @@ -50,6 +50,11 @@ pref("extensions.systemAddon.update.url", ""); @@ -60,5 +60,5 @@ index 31b3744c63..98e1a7b929 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 -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index e1f3858..d218af0 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From 6e26c435c18d09198b94ed772ff4e1840d1338b2 Mon Sep 17 00:00:00 2001 +From cb44d196feebe36434fdf433d3958835ef5358b6 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux @@ -94,5 +94,5 @@ index 988dc2d35a..940418bc9d 100644 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn # and mail/installer/allowed-dupes.mn: -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 65a90e0..4787ec3 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 3420f52e84a8902eee7394e98474781fd02014ce Mon Sep 17 00:00:00 2001 +From a95405607d17f87212af5b5584e28d32cf351873 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers @@ -138,5 +138,5 @@ index efb0b77aee..05a4deb462 100644 + +onionAddress.label=%S is %S's onion address. -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 89bc546..3ec3165 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From e3150c2c9018a68b1582a2c30c7e6821ea223c64 Mon Sep 17 00:00:00 2001 +From 1c17e0cd088be7c374e4ef558482254fc9e19072 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts @@ -166,5 +166,5 @@ index 6b49c84fad..de7fe8ed11 100644 <!ENTITY registerXMPP.label "Create this new account on the server"> +<!ENTITY tempXMPP.label "Create a temporary account automatically"> -- -2.14.1 +2.14.2 diff --git a/projects/instantbird/config b/projects/instantbird/config index 1d89837..2005ff9 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr52/ -hg_hash: THUNDERBIRD_52_3_0_RELEASE +hg_hash: THUNDERBIRD_52_4_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" var: diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 754f617..dcee63f 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From c0d3a7d4edcba39a098e5025271f7b7d59344304 Mon Sep 17 00:00:00 2001 +From 7c299eae2a3d81b1c48a3028ed2f16303f9c5e71 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Fri, 1 Sep 2017 17:39:04 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP @@ -115,5 +115,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; } -- -2.14.1 +2.14.2 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 23a9447..a4e21b3 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From 9772edfd02bf499342c3089473a807dcf47b2525 Mon Sep 17 00:00:00 2001 +From a7cfc17720295fb16c502fdbe5e368d8c7e986e5 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/5] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 } -- -2.14.1 +2.14.2 diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 8a9d260..5a9a877 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 6a753441870fcaf9b1c59f373b59e2242c9f3739 Mon Sep 17 00:00:00 2001 +From 2dffef93c06fbe27a3cdb9ebd62510add4a9f870 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 3/5] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 51633178226c..64584f579390 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.14.1 +2.14.2 diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index ab99be9..4ab0770 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From cfc8d680995fed12cc63633699dc28b40bb124a3 Mon Sep 17 00:00:00 2001 +From 24a757cb2d69bcf88a095bec4b2636ed7297eae1 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Fri, 1 Sep 2017 17:45:40 -0400 Subject: [PATCH 4/5] Updater fixups for TM @@ -804,5 +804,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.14.1 +2.14.2 diff --git a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index 5e83e5a..38212fc 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From 013421c4b0d74bc94fb3b460e7d3bcc0293f9c0f Mon Sep 17 00:00:00 2001 +From 603166eaf0c7de988b52f5db9cdaa53bd6b60e0f Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.14.1 +2.14.2 diff --git a/projects/mozilla/config b/projects/mozilla/config index bbbf55d..915b681 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.3.0esr-7.0-1-build1 +version: tor-browser-52.4.0esr-7.0-1-build1 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git git_hash: '[% c("version") %]' diff --git a/tor-browser-build b/tor-browser-build index fd97762..8c4c05d 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit fd97762cb0924eea137896425eab788daef6ca8d +Subproject commit 8c4c05ddcfc30107b967b204d491523685460226

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 10 Oct '17

10 Oct '17

commit ac06cfb607f70b645c38d4ade28b1a2f5553bf21 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 10 15:46:19 2017 +0000 Update translations for torbirdy --- ta/torbirdy.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ta/torbirdy.properties b/ta/torbirdy.properties index 208cacc3a..28b531760 100644 --- a/ta/torbirdy.properties +++ b/ta/torbirdy.properties @@ -4,15 +4,15 @@ torbirdy.enabled.tor=TorBirdy செயலாக்கப்பட்டது: torbirdy.enabled.jondo=TorBirdy செயலாக்கப்பட்டது: JonDo torbirdy.enabled.custom=TorBirdy செயலாக்கப்பட்டது: வழக்கமாக்கப்பட்ட Proxy torbirdy.enabled.torification=TorBirdy செயலாக்கப்பட்டது: கண்கூடான Tor-ஆக்கம் -torbirdy.enabled.whonix=TorBirdy Enabled: Whonix +torbirdy.enabled.whonix=TorBirdy செயலாக்கப்பட்டது: Whonix torbirdy.disabled=TorBirdy: செயல்நீக்கப்பட்டது! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: செயலாக்கப்பட்டது torbirdy.email.prompt=உங்களுடைய அடையாளமறியாதன்மையை பாதுகாக்க Thunderbird-நினுடைய தானியங்கி-கட்டமைப்பு வழிகாட்டியை TorBirdy செயல்நீக்கிவிட்டது.\n\n%S -க்கான பரிந்துரைக்கப்பட்ட பாதுகாப்பு அமைப்புகள் அமைக்கப்பட்டது.\n\nநீங்கள் தற்போது மற்ற கணக்கு அமைப்புகளை தாங்களாகவே கட்டமைக்கலாம். -torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. -torbirdy.email.advanced.nextwarning=Show this warning next time -torbirdy.email.advanced.title=TorBirdy Advanced Settings +torbirdy.email.advanced=TorBirdy -யின் மேம்பட்ட அமைப்புகளை மாற்றுவது பரிந்துரைக்கப்பட்டதல்ல என்பதை தயைகூர்ந்து கவனிக்கவும்.\n\nநீங்கள் செய்வது என்ன என்பது நிச்சயமாக தெரிந்தால் மட்டுமே மேற்கொண்டு தொடரவும். +torbirdy.email.advanced.nextwarning=இந்த எச்சரிக்கையை அடுத்த முறையும் காட்டு +torbirdy.email.advanced.title=TorBirdy மேம்பட்ட அமைப்புகள் torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users. torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0