- tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_34234'
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 4861f97c0f74bb1f69d422cdf6967a6628a05031 Merge: d3c7af8 8feea5a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 24 18:53:59 2020 +0000 Merge remote-tracking branch 'gkgl/bug_34234' README | 2 +- projects/debootstrap-image/config | 7 ------- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 4 files changed, 8 insertions(+), 15 deletions(-)

1 0

[tor-browser-build/master] Bug 34234: Move HTTPS Everywhere build to Debian Buster
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 8feea5ace569b0529d6281b98d95340a0414ce91 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 13:18:36 2020 +0000 Bug 34234: Move HTTPS Everywhere build to Debian Buster Additionally, clean up all Debian Stretch references. --- README | 2 +- projects/debootstrap-image/config | 7 ------- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/README b/README index a95f466..3e98d02 100644 --- a/README +++ b/README @@ -193,7 +193,7 @@ of containers: the container-image project is still called, but it will just create an empty file instead of a real container image. The build without containers is currently only supported for the Android -builds, and will require that you run Debian Stretch and install build +builds, and will require that you run Debian Buster and install build dependencies for all the components that are built. This can be done with the following command: diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 8e83d81..6ee4a64 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -56,13 +56,6 @@ targets: arch: amd64 debootstrap_mirror: "http://archive.debian.org/debian/" - stretch-amd64: - var: - minimal_apt_version: 1.4.9 - container: - suite: stretch - arch: amd64 - buster-amd64: var: minimal_apt_version: 1.8.2 diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a5be759..f75a841 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,14 +10,14 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to stretch/amd64 for all platforms. This allows us to create only one + # to buster/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: stretch + suite: buster arch: amd64 deps: - git @@ -34,4 +34,4 @@ input_files: - project: python name: python target_prepend: - - common-stretch + - common-buster diff --git a/rbm.conf b/rbm.conf index 8f1143e..ac56689 100644 --- a/rbm.conf +++ b/rbm.conf @@ -179,13 +179,13 @@ targets: # Don't create mar files to save time build_mar: 0 - # The common-stretch target is used to build components that are common to all - # platforms, using Debian stretch. - common-stretch: + # The common-buster target is used to build components that are common to all + # platforms, using Debian Buster. + common-buster: var: common: 1 container: - suite: stretch + suite: buster arch: amd64 pre_pkginst: '' deps:

1 0

[tor-browser-build/maint-9.5] No need for the 0.4.3.6 patch file anymore
by gk＠torproject.org 23 Aug '20

23 Aug '20

commit bad091590e3d4db6995ccfe5efa03756e5e7234f Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 23 19:54:50 2020 +0000 No need for the 0.4.3.6 patch file anymore Thanks cypherpunk. --- ...ve-accessor-semantic-of-client-cached-obj.patch | 212 --------------------- 1 file changed, 212 deletions(-) diff --git a/projects/tor/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch b/projects/tor/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch deleted file mode 100644 index 1432039..0000000 --- a/projects/tor/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch +++ /dev/null @@ -1,212 +0,0 @@ -From 1810771799dd0b434ac2b5926297d64e383582e1 Mon Sep 17 00:00:00 2001 -From: David Goulet <dgoulet(a)torproject.org> -Date: Tue, 10 Mar 2020 10:58:51 -0400 -Subject: [PATCH] hs-v3: Improve accessor semantic of client cached object - -Add an inline helper function that indicates if the cached object contains a -decrypted descriptor or not. - -The descriptor object is NULL if tor is unable to decrypt it (lacking client -authorization) and some actions need to be done only when we have a decrypted -object. - -This improves code semantic. - -Fixes #33458 - -Signed-off-by: David Goulet <dgoulet(a)torproject.org> ---- - src/feature/hs/hs_cache.c | 64 +++++++++++++++++++++++++++++++-------- - src/test/test_hs_client.c | 46 ++++++++++++++++++++++++++++ - 2 files changed, 98 insertions(+), 12 deletions(-) - -diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c -index 9cf408ca3e..44cd2505fd 100644 ---- a/src/feature/hs/hs_cache.c -+++ b/src/feature/hs/hs_cache.c -@@ -27,6 +27,21 @@ - static int cached_client_descriptor_has_expired(time_t now, - const hs_cache_client_descriptor_t *cached_desc); - -+/** Helper function: Return true iff the cache entry has a decrypted -+ * descriptor. -+ * -+ * A NULL desc object in the entry means that we were not able to decrypt the -+ * descriptor because we are likely lacking client authorization. It is still -+ * a valid entry but some operations can't be done without the decrypted -+ * descriptor thus this function MUST be used to safe guard access to the -+ * decrypted desc object. */ -+static inline bool -+entry_has_decrypted_descriptor(const hs_cache_client_descriptor_t *entry) -+{ -+ tor_assert(entry); -+ return (entry->desc != NULL); -+} -+ - /********************** Directory HS cache ******************/ - - /** Directory descriptor cache. Map indexed by blinded key. */ -@@ -341,8 +356,23 @@ static digest256map_t *hs_cache_client_intro_state; - static size_t - cache_get_client_entry_size(const hs_cache_client_descriptor_t *entry) - { -- return sizeof(*entry) + -- strlen(entry->encoded_desc) + hs_desc_obj_size(entry->desc); -+ size_t size = 0; -+ -+ if (entry == NULL) { -+ goto end; -+ } -+ size += sizeof(*entry); -+ -+ if (entry->encoded_desc) { -+ size += strlen(entry->encoded_desc); -+ } -+ -+ if (entry_has_decrypted_descriptor(entry)) { -+ size += hs_desc_obj_size(entry->desc); -+ } -+ -+ end: -+ return size; - } - - /** Remove a given descriptor from our cache. */ -@@ -659,14 +689,20 @@ cache_store_as_client(hs_cache_client_descriptor_t *client_desc) - * client authorization. */ - cache_entry = lookup_v3_desc_as_client(client_desc->key.pubkey); - if (cache_entry != NULL) { -- /* Signalling an undecrypted descriptor. We'll always replace the one we -- * have with the new one just fetched. */ -- if (cache_entry->desc == NULL) { -+ /* If the current or the new cache entry don't have a decrypted descriptor -+ * (missing client authorization), we always replace the current one with -+ * the new one. Reason is that we can't inspect the revision counter -+ * within the plaintext data so we blindly replace. */ -+ if (!entry_has_decrypted_descriptor(cache_entry) || -+ !entry_has_decrypted_descriptor(client_desc)) { - remove_v3_desc_as_client(cache_entry); - cache_client_desc_free(cache_entry); - goto store; - } - -+ /* From this point on, we know that the decrypted descriptor is in the -+ * current entry and new object thus safe to access. */ -+ - /* If we have an entry in our cache that has a revision counter greater - * than the one we just fetched, discard the one we fetched. */ - if (cache_entry->desc->plaintext_data.revision_counter > -@@ -740,11 +776,15 @@ cache_clean_v3_as_client(time_t now) - MAP_DEL_CURRENT(key); - entry_size = cache_get_client_entry_size(entry); - bytes_removed += entry_size; -+ - /* We just removed an old descriptor. We need to close all intro circuits -- * so we don't have leftovers that can be selected while lacking a -- * descriptor. We leave the rendezvous circuits opened because they could -- * be in use. */ -- hs_client_close_intro_circuits_from_desc(entry->desc); -+ * if the descriptor is decrypted so we don't have leftovers that can be -+ * selected while lacking a descriptor. Circuits are selected by intro -+ * authentication key thus we need the descriptor. We leave the rendezvous -+ * circuits opened because they could be in use. */ -+ if (entry_has_decrypted_descriptor(entry)) { -+ hs_client_close_intro_circuits_from_desc(entry->desc); -+ } - /* Entry is not in the cache anymore, destroy it. */ - cache_client_desc_free(entry); - /* Update our OOM. We didn't use the remove() function because we are in -@@ -793,7 +833,7 @@ hs_cache_lookup_as_client(const ed25519_public_key_t *key) - tor_assert(key); - - cached_desc = lookup_v3_desc_as_client(key->pubkey); -- if (cached_desc && cached_desc->desc) { -+ if (cached_desc && entry_has_decrypted_descriptor(cached_desc)) { - return cached_desc->desc; - } - -@@ -866,7 +906,7 @@ hs_cache_remove_as_client(const ed25519_public_key_t *key) - /* If we have a decrypted/decoded descriptor, attempt to close its - * introduction circuit(s). We shouldn't have circuit(s) without a - * descriptor else it will lead to a failure. */ -- if (cached_desc->desc) { -+ if (entry_has_decrypted_descriptor(cached_desc)) { - hs_client_close_intro_circuits_from_desc(cached_desc->desc); - } - /* Remove and free. */ -@@ -995,7 +1035,7 @@ hs_cache_client_new_auth_parse(const ed25519_public_key_t *service_pk) - } - - cached_desc = lookup_v3_desc_as_client(service_pk->pubkey); -- if (cached_desc == NULL || cached_desc->desc != NULL) { -+ if (cached_desc == NULL || entry_has_decrypted_descriptor(cached_desc)) { - /* No entry for that service or the descriptor is already decoded. */ - goto end; - } -diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c -index 5f7fe9c404..bff71d2645 100644 ---- a/src/test/test_hs_client.c -+++ b/src/test/test_hs_client.c -@@ -965,6 +965,7 @@ test_close_intro_circuits_new_desc(void *arg) - (void) arg; - - hs_init(); -+ rend_cache_init(); - - /* This is needed because of the client cache expiration timestamp is based - * on having a consensus. See cached_client_descriptor_has_expired(). */ -@@ -989,6 +990,51 @@ test_close_intro_circuits_new_desc(void *arg) - circ->purpose = CIRCUIT_PURPOSE_C_INTRODUCING; - ocirc = TO_ORIGIN_CIRCUIT(circ); - -+ /* Build a descriptor _without_ client authorization and thus not -+ * decryptable. Make sure the close circuit code path is not triggered. */ -+ { -+ char *desc_encoded = NULL; -+ uint8_t descriptor_cookie[HS_DESC_DESCRIPTOR_COOKIE_LEN]; -+ curve25519_keypair_t client_kp; -+ hs_descriptor_t *desc = NULL; -+ -+ tt_int_op(0, OP_EQ, curve25519_keypair_generate(&client_kp, 0)); -+ crypto_rand((char *) descriptor_cookie, sizeof(descriptor_cookie)); -+ -+ desc = hs_helper_build_hs_desc_with_client_auth(descriptor_cookie, -+ &client_kp.pubkey, -+ &service_kp); -+ tt_assert(desc); -+ ret = hs_desc_encode_descriptor(desc, &service_kp, descriptor_cookie, -+ &desc_encoded); -+ tt_int_op(ret, OP_EQ, 0); -+ /* Associate descriptor intro key with the dummy circuit. */ -+ const hs_desc_intro_point_t *ip = -+ smartlist_get(desc->encrypted_data.intro_points, 0); -+ tt_assert(ip); -+ ocirc->hs_ident = hs_ident_circuit_new(&service_kp.pubkey); -+ ed25519_pubkey_copy(&ocirc->hs_ident->intro_auth_pk, -+ &ip->auth_key_cert->signed_key); -+ hs_descriptor_free(desc); -+ tt_assert(desc_encoded); -+ /* Put it in the cache. Should not be decrypted since the client -+ * authorization creds were not added to the global map. */ -+ ret = hs_cache_store_as_client(desc_encoded, &service_kp.pubkey); -+ tor_free(desc_encoded); -+ tt_int_op(ret, OP_EQ, HS_DESC_DECODE_NEED_CLIENT_AUTH); -+ -+ /* Clean cache with a future timestamp. It will trigger the clean up and -+ * attempt to close the circuit but only if the descriptor is decryptable. -+ * Cache object should be removed and circuit untouched. */ -+ hs_cache_clean_as_client(mock_ns.valid_after + (60 * 60 * 24)); -+ tt_assert(!hs_cache_lookup_as_client(&service_kp.pubkey)); -+ -+ /* Make sure the circuit still there. */ -+ tt_assert(circuit_get_next_intro_circ(NULL, true)); -+ /* Get rid of the ident, it will be replaced in the next tests. */ -+ hs_ident_circuit_free(ocirc->hs_ident); -+ } -+ - /* Build the first descriptor and cache it. */ - { - char *encoded; --- -2.20.1 -

1 0

[tor-browser-build/master] Release preparations for 10.0a6
by sysrqb＠torproject.org 23 Aug '20

23 Aug '20

commit d3c7af80c77facabb2633927e264f16723ce983b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Aug 23 18:42:11 2020 +0000 Release preparations for 10.0a6 Versions bump and Changelog update --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index d42474b..aa34b7e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.1.0 + firefox_platform_version: 78.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a5be759..ec8669f 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.5.20 +version: 2020.8.13 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 096e0d7..52f3b3c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,23 @@ +Tor Browser 10.0a6 -- August 26 2020 + * Windows + OS X + Linux + * Update Firefox to 78.2.0esr + * Update Tor Launcher to 0.2.23 + * Translations update + * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher] + * Update NoScript to 11.0.39 + * Bug 21601: Remove unused media.webaudio.enabled pref + * Bug 40002: Remove about:pioneer [tor-browser] + * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser] + * Bug 40088: Moat "Submit" button does not work + * Bug 40090: Disable v3 add-on blocklist for now [tor-browser] + * OS X + * Bug 40015: Tor Browser broken on MacOS 11 Big Sur + * Build System + * Windows + OS X + Linux + * Bump Go to 1.13.15 + * Linux + * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build] + Tor Browser 10.0a5 -- August 18 2020 * Windows + OS X + Linux * Update Firefox to 78.1.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 251b1ca..fc81a4f 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: fed4b7554da3e334c32f27d155967fd1bc40e7b80941290bb9a57bb3f40e7480 + sha256sum: d0ade42bee14ea2498cf8868c2d0ef2d5acae563d22cb788b33a86b80e7f7b5e - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index ba799c5..95a2f02 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.22 +version: 0.2.23 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 8f1143e..ab73841 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a5' + torbrowser_version: '10.0a6' torbrowser_build: 'build2' torbrowser_incremental_from: - - 10.0a4 + - 10.0a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 23 Aug '20

23 Aug '20

commit 37e128fe3e2d9ddf2867b5e875e02d7de246a387 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Aug 23 18:17:00 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 6c2cf4bce30c..8ed0f04ce76f 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 6c2cf4bce30cf21bb3cb121e940248cd3b8a164a +Subproject commit 8ed0f04ce76f0ed311975082c739823ecbbbaf80

1 0

[tor-launcher/master] Release preparations for 0.2.23
by sysrqb＠torproject.org 23 Aug '20

23 Aug '20

commit 76b474b3fc7eb2a7653f2edc264273030766256a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Aug 23 18:22:37 2020 +0000 Release preparations for 0.2.23 Translations update and version bump --- src/chrome/locale/es-AR/network-settings.dtd | 10 +++++----- src/chrome/locale/zh-HK/torlauncher.properties | 2 +- src/install.rdf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 1c353d2..208046a 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -54,8 +54,8 @@ <!ENTITY torsettings.proxyHelpTitle "Ayuda para Proxy"> <!ENTITY torsettings.proxyHelp1 "Un proxy local puede ser necesario cuando te estés conectando a través de una red de una compañía, escuela o universidad. Si no estás seguro si un proxy es necesario, mirá los ajustes de Internet en otro navegador o revisá tus ajustes de red del sistema."> -<!ENTITY torsettings.bridgeHelpTitle "Ayuda para relevo puente"> -<!ENTITY torsettings.bridgeHelp1 "Puentes son relevos no listados que hacen más dificultoso bloquear conexiones a la red de Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor."> +<!ENTITY torsettings.bridgeHelpTitle "Ayuda para Repetidor Puente"> +<!ENTITY torsettings.bridgeHelp1 "Los puentes son repetidores no listados que hacen más dificultoso bloquear conexiones a la red Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor."> <!ENTITY torsettings.bridgeHelp2 "Por la manera en que ciertos países intentan bloquear a Tor, ciertos puentes funcionan en ciertos países pero no otros.  Si no estás seguro acerca de cuáles puentes funcionan en tu país, visitá torproject.org/about/contact.html#support">  @@ -64,15 +64,15 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Configuraciones de Tor"> -<!ENTITY torPreferences.torSettingsDescription "El navegador Tor enruta tu trafico a través de la red Tor, mantenida por miles de voluntarios en todo el mundo." > +<!ENTITY torPreferences.torSettingsDescription "El navegador Tor enruta tu tráfico a través de la red Tor, mantenida por miles de voluntarios en todo el mundo." > <!ENTITY torPreferences.learnMore "Aprendé más"> <!ENTITY torPreferences.bridges "Puentes"> -<!ENTITY torPreferences.bridgesDescription "Los puentes te permiten acceder a la red Tor desde lugares donde Tor esta bloqueado. Dependiendo de donde te encuentres, algunos puentes funcionaran mejor que otros."> +<!ENTITY torPreferences.bridgesDescription "Los puentes te permiten acceder a la red Tor desde lugares donde Tor está bloqueado. Dependiendo de dónde te encuentres, algunos puentes funcionarán mejor que otros."> <!ENTITY torPreferences.useBridge "Usar un puente"> <!ENTITY torPreferences.requestNewBridge "Solicitá un nuevo puente..."> <!ENTITY torPreferences.provideBridge "Proveer un puente"> <!ENTITY torPreferences.advanced "Avanzado"> -<!ENTITY torPreferences.advancedDescription "Configurar como el Navegador Tor se conecta a internet."> +<!ENTITY torPreferences.advancedDescription "Configurar cómo se conecta a internet el Navegador Tor."> <!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por coma"> <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitá un puente"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando BridgeDB. Por favor esperá."> diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 12ed3d5..bf53b9f 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -53,7 +53,7 @@ torlauncher.forAssistance2=如需協助，請到訪%S torlauncher.copiedNLogMessages=複製完成。%S Tor洋蔥路由日誌已準備好被貼到文字編輯器或電郵。 -torlauncher.bootstrapStatus.starting=Starting +torlauncher.bootstrapStatus.starting=啟動中 torlauncher.bootstrapStatus.conn_pt=Connecting to bridge torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy diff --git a/src/install.rdf b/src/install.rdf index 8eed6d4..b0a80cc 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.22</em:version> + <em:version>0.2.23</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Bug 40002: After rebasing to 80.0b2 moat is broken
by gk＠torproject.org 22 Aug '20

22 Aug '20

commit 9f77f5a02cd02b71fdb06fd934de26569d6876be Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 13:59:24 2020 -0400 Bug 40002: After rebasing to 80.0b2 moat is broken Mozilla renamed some of the nsILoadInfo security flags. --- src/modules/tl-bridgedb.jsm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 8cc7919..6f088e1 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -546,10 +546,18 @@ _MoatRequestor.prototype = // There does not seem to be a way to directly create an nsILoadInfo from // JavaScript, so we create a throw away non-proxied channel to get one. + // In Firefox 80 the nsILoadInfo security flags were renamed. When + // backwards compatibility with older Firefox code is no longer a + // requirement we can remove the following conditional and always use + // Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL. + const secFlags = + "SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL" in Ci.nsILoadInfo + ? Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL + : Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL; let loadInfo = Services.io.newChannelFromURI(uri, undefined, Services.scriptSecurityManager.getSystemPrincipal(), undefined, - Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, + secFlags, Ci.nsIContentPolicy.TYPE_OTHER).loadInfo; let httpHandler = Services.io.getProtocolHandler("http") .QueryInterface(Ci.nsIHttpProtocolHandler);

1 0

[torbutton/master] Bug 21601: Remove unused media.webaudio.enabled pref
by gk＠torproject.org 21 Aug '20

21 Aug '20

commit 3b29f04cf3429724ec00506324493635614fb5bb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 11:21:54 2020 +0000 Bug 21601: Remove unused media.webaudio.enabled pref It is gone since https://bugzilla.mozilla.org/show_bug.cgi?id=968479. --- modules/security-prefs.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index f6e397d4..c0128eea 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -2,7 +2,7 @@ // ### Utilities -let { getBoolPref, setBoolPref, getIntPref, setIntPref } = +let { getBoolPref, setBoolPref, getIntPref, setIntPref, clearUserPref } = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services.prefs; // Used for detecting the current system architecture @@ -28,7 +28,6 @@ const kSecuritySettings = { "javascript.options.ion" : [, false, false, false, true ], "javascript.options.baselinejit" : [, false, false, false, true ], "javascript.options.native_regexp" : [, false, false, false, true ], - "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], "gfx.font_rendering.graphite.enabled" : [, false, false, false, true ], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], @@ -143,7 +142,6 @@ var initialize = function () { // If the security settings level and the prefs that we did not change // have the default value, reset to default security level. const prefNames = [ - "media.webaudio.enabled", "mathml.disabled", "gfx.font_rendering.opentype_svg.enabled", "svg.disabled" @@ -153,6 +151,7 @@ var initialize = function () { read_setting_from_prefs(prefNames) === 4) { setBoolPref(kCustomPref, false); } + clearUserPref("media.webaudio.enabled"); setIntPref(kSliderMigration, 1); } log(4, "security-prefs.js initialization complete");

1 0

[torbutton/master] Bug 40082: Let JavaScript on safest setting handled by NoScript again
by gk＠torproject.org 21 Aug '20

21 Aug '20

commit 8ed0f04ce76f0ed311975082c739823ecbbbaf80 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 18:10:34 2020 +0000 Bug 40082: Let JavaScript on safest setting handled by NoScript again --- modules/security-prefs.js | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index c0128eea..d02e0d94 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -4,11 +4,6 @@ let { getBoolPref, setBoolPref, getIntPref, setIntPref, clearUserPref } = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services.prefs; - -// Used for detecting the current system architecture -let { XPCOMABI } = - Cu.import("resource://gre/modules/Services.jsm", {}).Services.appinfo; - let { bindPref, bindPrefAndInit } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -34,7 +29,6 @@ const kSecuritySettings = { "svg.disabled" : [, true, false, false, false], "javascript.options.asmjs" : [, false, false, false, true ], "javascript.options.wasm" : [, false, false, false, true ], - "javascript.enabled" : [, false, true, true, true ], }; // The Security Settings prefs in question. @@ -137,22 +131,16 @@ var initialize = function () { write_setting_to_prefs(2); } - // Revert #31616 and #31140 fixes - if (getIntPref(kSliderMigration, 0) < 1) { - // If the security settings level and the prefs that we did not change - // have the default value, reset to default security level. - const prefNames = [ - "mathml.disabled", - "gfx.font_rendering.opentype_svg.enabled", - "svg.disabled" - ]; - if (getBoolPref(kCustomPref) && XPCOMABI.split("-")[0] == "aarch64" && - getIntPref(kSliderPref) === 4 && - read_setting_from_prefs(prefNames) === 4) { - setBoolPref(kCustomPref, false); + // Revert #33613 fix + if (getIntPref(kSliderMigration, 0) < 2) { + // We can't differentiate between users having flipped `javascript.enabled` + // to `false` before it got governed by the security settings vs. those who + // had it flipped due to #33613. Reset the preference for everyone. + if (getIntPref(kSliderPref) === 1) { + setBoolPref("javascript.enabled", true); } clearUserPref("media.webaudio.enabled"); - setIntPref(kSliderMigration, 1); + setIntPref(kSliderMigration, 2); } log(4, "security-prefs.js initialization complete"); };

1 0

[tor-browser-build/master] Bug 40053: Also create the langpacks tarball for non-release builds.
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 3a845c42c631e0a746bc0cd702c54fdf7e8c08d3 Author: anonym <anonym(a)riseup.net> Date: Mon Aug 17 12:52:38 2020 +0200 Bug 40053: Also create the langpacks tarball for non-release builds. This is useful for Tails' QA when integrating new Tor Browser major releases. --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 24c8265..2763ce4 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -301,7 +301,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% END -%] # Create a tarball with all Linux x86_64 language packs (Bug 32676) -[% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] +[% IF c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] pushd $rootdir/[% c('input_files_by_name/firefox-langpacks') %] [% c('tar', { tar_src => [ '.' ],

1 0

[tor-browser/tor-browser-80.0b2-10.0-1] Bug 40090: Disable v3 add-on blocklist for now
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 6fad1d01f4df635defa7254d7390fc401f522744 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 19 10:38:48 2020 +0000 Bug 40090: Disable v3 add-on blocklist for now That's desktop-only as the v3 blocklist is not enabled on mobile yet, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1639050. --- browser/app/profile/firefox.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 6017d524bc8c..80652220eb05 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -42,9 +42,9 @@ pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firef pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firef…"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition…"); -// Use bloomfilters for the addons blocklist, instead of JSON only. -pref("extensions.blocklist.useMLBF", true); -pref("extensions.blocklist.useMLBF.stashes", true); +// No bloomfilters for the addons blocklist for now, but JSON only. +pref("extensions.blocklist.useMLBF", false); +pref("extensions.blocklist.useMLBF.stashes", false); // The URL for the privacy policy related to recommended extensions. pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_med…");

1 0

[tor-browser/tor-browser-80.0b2-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit c2228fa0593281dba61a9f4bad0014943a88d634 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 19 19:20:43 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 027e6a152655..45419d001a7b 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -8,12 +8,10 @@ const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); class RequestBridgeDialog { constructor() { this._dialog = null; - this._submitCommand = null; this._submitButton = null; this._dialogDescription = null; this._captchaImage = null; this._captchaEntryTextbox = null; - this._captchaRefreshCommand = null; this._captchaRefreshButton = null; this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; @@ -26,12 +24,8 @@ class RequestBridgeDialog { submitButton: "accept" /* not really a selector but a key for dialog's getButton */, dialogDescription: "description#torPreferences-requestBridge-description", - submitCommand: "command#torPreferences-requestBridge-submitCommand", captchaImage: "image#torPreferences-requestBridge-captchaImage", - captchaEntryTextbox: - "input#torPreferences-requestBridge-captchaTextbox", - refreshCaptchaCommand: - "command#torPreferences-requestBridge-refreshCaptchaCommand", + captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox", refreshCaptchaButton: "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: @@ -45,7 +39,8 @@ class RequestBridgeDialog { const selectors = RequestBridgeDialog.selectors; this._dialog = dialog; - this._dialog.setAttribute( + const dialogWin = dialog.parentElement; + dialogWin.setAttribute( "title", TorStrings.settings.requestBridgeDialogTitle ); @@ -61,16 +56,17 @@ class RequestBridgeDialog { } else if (bridges) { this._bridges = bridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + this._dialog.cancelDialog(); } }); - this._submitCommand = this._dialog.querySelector(selectors.submitCommand); - this._submitButton = this._dialog.getButton(selectors.submitButton); this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha); - this._submitButton.setAttribute("command", this._submitCommand.id); this._submitButton.disabled = true; + this._dialog.addEventListener("dialogaccept", e => { + e.preventDefault(); + this.onSubmitCaptcha(); + }); this._dialogDescription = this._dialog.querySelector( selectors.dialogDescription @@ -93,30 +89,14 @@ class RequestBridgeDialog { TorStrings.settings.captchaTextboxPlaceholder ); this._captchaEntryTextbox.disabled = true; - this._captchaEntryTextbox.onkeypress = evt => { - const ENTER_KEY = 13; - if (evt.keyCode == ENTER_KEY) { - // logically same as pressing the 'submit' button of the parent dialog - this.onSubmitCaptcha(); - return false; - } - return true; - }; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { this._submitButton.disabled = this._captchaEntryTextbox.value == ""; }; - this._captchaRefreshCommand = this._dialog.querySelector( - selectors.refreshCaptchaCommand - ); this._captchaRefreshButton = this._dialog.querySelector( selectors.refreshCaptchaButton ); - this._captchaRefreshButton.setAttribute( - "command", - this._captchaRefreshCommand.id - ); this._captchaRefreshButton.disabled = true; this._incorrectCaptchaHbox = this._dialog.querySelector( @@ -183,7 +163,9 @@ class RequestBridgeDialog { this._bridges = aBridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); }) .catch(aError => { this._bridges = []; diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml index 1081194caf50..64c4507807fb 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml @@ -3,13 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-requestBridge-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="Request Bridge" - buttons="cancel,accept" - role="dialog"> - <command id="torPreferences-requestBridge-submitCommand" oncommand="requestBridgeDialog.onSubmitCaptcha();"/> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-requestBridge-dialog" + buttons="accept,cancel">  @@ -18,8 +16,9 @@ <image id="torPreferences-requestBridge-captchaImage" flex="1"/> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/> - <command id="torPreferences-requestBridge-refreshCaptchaCommand" oncommand="requestBridgeDialog.onRefreshCaptcha();"/> - <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://browser/skin/reload.svg"/> + <button id="torPreferences-requestBridge-refreshCaptchaButton" + image="chrome://browser/skin/reload.svg" + oncommand="requestBridgeDialog.onRefreshCaptcha();"/> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> @@ -32,4 +31,5 @@ let dialog = document.getElementById("torPreferences-requestBridge-dialog"); requestBridgeDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm index 70e49ac048f8..ba4b76738447 100644 --- a/browser/components/torpreferences/content/torLogDialog.jsm +++ b/browser/components/torpreferences/content/torLogDialog.jsm @@ -23,7 +23,8 @@ class TorLogDialog { _populateXUL(aDialog) { this._dialog = aDialog; - this._dialog.setAttribute("title", TorStrings.settings.torLogDialogTitle); + const dialogWin = this._dialog.parentElement; + dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle); this._logTextarea = this._dialog.querySelector( TorLogDialog.selectors.logTextarea diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml index ae0f4b294204..9c17f8132978 100644 --- a/browser/components/torpreferences/content/torLogDialog.xhtml +++ b/browser/components/torpreferences/content/torLogDialog.xhtml @@ -3,11 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-torLog-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - buttons="accept,extra1" - role="dialog"> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-torLog-dialog" + buttons="accept,extra1"> <html:textarea id="torPreferences-torDialog-textarea" multiline="true" @@ -19,4 +19,5 @@ let dialog = document.getElementById("torPreferences-torLog-dialog"); torLogDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 76ee81e0323d2416848b4e03aceebd722f752da3 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 19 19:20:43 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 027e6a152655..45419d001a7b 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -8,12 +8,10 @@ const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); class RequestBridgeDialog { constructor() { this._dialog = null; - this._submitCommand = null; this._submitButton = null; this._dialogDescription = null; this._captchaImage = null; this._captchaEntryTextbox = null; - this._captchaRefreshCommand = null; this._captchaRefreshButton = null; this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; @@ -26,12 +24,8 @@ class RequestBridgeDialog { submitButton: "accept" /* not really a selector but a key for dialog's getButton */, dialogDescription: "description#torPreferences-requestBridge-description", - submitCommand: "command#torPreferences-requestBridge-submitCommand", captchaImage: "image#torPreferences-requestBridge-captchaImage", - captchaEntryTextbox: - "input#torPreferences-requestBridge-captchaTextbox", - refreshCaptchaCommand: - "command#torPreferences-requestBridge-refreshCaptchaCommand", + captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox", refreshCaptchaButton: "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: @@ -45,7 +39,8 @@ class RequestBridgeDialog { const selectors = RequestBridgeDialog.selectors; this._dialog = dialog; - this._dialog.setAttribute( + const dialogWin = dialog.parentElement; + dialogWin.setAttribute( "title", TorStrings.settings.requestBridgeDialogTitle ); @@ -61,16 +56,17 @@ class RequestBridgeDialog { } else if (bridges) { this._bridges = bridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + this._dialog.cancelDialog(); } }); - this._submitCommand = this._dialog.querySelector(selectors.submitCommand); - this._submitButton = this._dialog.getButton(selectors.submitButton); this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha); - this._submitButton.setAttribute("command", this._submitCommand.id); this._submitButton.disabled = true; + this._dialog.addEventListener("dialogaccept", e => { + e.preventDefault(); + this.onSubmitCaptcha(); + }); this._dialogDescription = this._dialog.querySelector( selectors.dialogDescription @@ -93,30 +89,14 @@ class RequestBridgeDialog { TorStrings.settings.captchaTextboxPlaceholder ); this._captchaEntryTextbox.disabled = true; - this._captchaEntryTextbox.onkeypress = evt => { - const ENTER_KEY = 13; - if (evt.keyCode == ENTER_KEY) { - // logically same as pressing the 'submit' button of the parent dialog - this.onSubmitCaptcha(); - return false; - } - return true; - }; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { this._submitButton.disabled = this._captchaEntryTextbox.value == ""; }; - this._captchaRefreshCommand = this._dialog.querySelector( - selectors.refreshCaptchaCommand - ); this._captchaRefreshButton = this._dialog.querySelector( selectors.refreshCaptchaButton ); - this._captchaRefreshButton.setAttribute( - "command", - this._captchaRefreshCommand.id - ); this._captchaRefreshButton.disabled = true; this._incorrectCaptchaHbox = this._dialog.querySelector( @@ -183,7 +163,9 @@ class RequestBridgeDialog { this._bridges = aBridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); }) .catch(aError => { this._bridges = []; diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml index 1081194caf50..64c4507807fb 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml @@ -3,13 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-requestBridge-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="Request Bridge" - buttons="cancel,accept" - role="dialog"> - <command id="torPreferences-requestBridge-submitCommand" oncommand="requestBridgeDialog.onSubmitCaptcha();"/> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-requestBridge-dialog" + buttons="accept,cancel">  @@ -18,8 +16,9 @@ <image id="torPreferences-requestBridge-captchaImage" flex="1"/> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/> - <command id="torPreferences-requestBridge-refreshCaptchaCommand" oncommand="requestBridgeDialog.onRefreshCaptcha();"/> - <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://browser/skin/reload.svg"/> + <button id="torPreferences-requestBridge-refreshCaptchaButton" + image="chrome://browser/skin/reload.svg" + oncommand="requestBridgeDialog.onRefreshCaptcha();"/> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> @@ -32,4 +31,5 @@ let dialog = document.getElementById("torPreferences-requestBridge-dialog"); requestBridgeDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm index 70e49ac048f8..ba4b76738447 100644 --- a/browser/components/torpreferences/content/torLogDialog.jsm +++ b/browser/components/torpreferences/content/torLogDialog.jsm @@ -23,7 +23,8 @@ class TorLogDialog { _populateXUL(aDialog) { this._dialog = aDialog; - this._dialog.setAttribute("title", TorStrings.settings.torLogDialogTitle); + const dialogWin = this._dialog.parentElement; + dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle); this._logTextarea = this._dialog.querySelector( TorLogDialog.selectors.logTextarea diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml index ae0f4b294204..9c17f8132978 100644 --- a/browser/components/torpreferences/content/torLogDialog.xhtml +++ b/browser/components/torpreferences/content/torLogDialog.xhtml @@ -3,11 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-torLog-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - buttons="accept,extra1" - role="dialog"> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-torLog-dialog" + buttons="accept,extra1"> <html:textarea id="torPreferences-torDialog-textarea" multiline="true" @@ -19,4 +19,5 @@ let dialog = document.getElementById("torPreferences-torLog-dialog"); torLogDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 4e14e8b6d6bb1bb3a9a43a9ff5af1a6edcdbcc0b Merge: ee9af3088c44 76ee81e0323d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 13:21:14 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1 .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-)

1 0

[torbutton/master] Translations update
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 578edc4c493fb5a68434f2d91368dc3caee71a94 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 10:31:18 2020 +0000 Translations update --- chrome/locale/es-AR/aboutTor.dtd | 2 +- chrome/locale/es-AR/browserOnboarding.properties | 10 ++--- chrome/locale/es-AR/torbutton.dtd | 8 ++-- chrome/locale/es-AR/torbutton.properties | 48 ++++++++++++------------ 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/chrome/locale/es-AR/aboutTor.dtd b/chrome/locale/es-AR/aboutTor.dtd index f1332912..e1400c05 100644 --- a/chrome/locale/es-AR/aboutTor.dtd +++ b/chrome/locale/es-AR/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor es de uso gratuito gracias a las donaciones de personas como usted."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor es gratis gracias a las donaciones de personas como vos."> <!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> diff --git a/chrome/locale/es-AR/browserOnboarding.properties b/chrome/locale/es-AR/browserOnboarding.properties index e02ed823..d07615b4 100644 --- a/chrome/locale/es-AR/browserOnboarding.properties +++ b/chrome/locale/es-AR/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Ir a la red de Tor onboarding.tour-tor-network=Red de Tor onboarding.tour-tor-network.title=Viajá por una red descentralizada. onboarding.tour-tor-network.description=El Navegador Tor te conecta a la red Tor, formada por miles de voluntarios alrededor del mundo. A diferencia de una RPV, no hay un único punto de falla o entidad central en la cual necesités confiar de manera de disfrutar de internet privadamente. -onboarding.tour-tor-network.description-para2=NOVEDAD: La configuración de la red Tor. Incluyendo posibilidad de solicitar puentes para donde Tor esta bloqueado, fue movida a Preferencias. -onboarding.tour-tor-network.action-button=Ajusta la configuración de tu red Tor +onboarding.tour-tor-network.description-para2=NOVEDAD: La configuración de la red Tor, incluyendo la posibilidad de solicitar puentes en donde Tor está bloqueado, puede ser encontrada en Preferencias. +onboarding.tour-tor-network.action-button=Ajustá la configuración de tu red Tor onboarding.tour-tor-network.button=Ir a visualización de Circuito onboarding.tour-tor-circuit-display=Visualización de Circuito @@ -49,9 +49,9 @@ onboarding.tour-tor-update.prefix-new=Nuevo onboarding.tour-tor-update.prefix-updated=Actualizado onboarding.tour-tor-toolbar=Barra de herramientas -onboarding.tour-tor-toolbar-update-9.0.title=Adios botón Onion -onboarding.tour-tor-toolbar-update-9.0.description=Queremos que su experiencia con Tor se integre completamente en el navegador Tor. -onboarding.tour-tor-toolbar-update-9.0.description-para2=Es por eso que ahora, en lugar de usar el botón Onion, puedes ver tu Circuito Tor a través de [i] en la barra de URL y solicitar una Nueva Identidad usando el botón de la barra de herramientas o el menú [≡]. +onboarding.tour-tor-toolbar-update-9.0.title=Chau botón Onion +onboarding.tour-tor-toolbar-update-9.0.description=Queremos que tu experiencia con Tor se integre completamente en el Navegador Tor. +onboarding.tour-tor-toolbar-update-9.0.description-para2=Es por eso que ahora, en lugar de usar el botón cebolla, podés ver tu Circuito Tor a través de [i] en la barra de URL, y solicitar una Nueva Identidad usando el botón de la barra de herramientas o el menú [≡]. onboarding.tour-tor-toolbar-update-9.0.button=Cómo solicitar una nueva identidad onboarding.tour-tor-toolbar-update-9.0.next-button=Ir a la red Tor diff --git a/chrome/locale/es-AR/torbutton.dtd b/chrome/locale/es-AR/torbutton.dtd index a139246c..795a71f1 100644 --- a/chrome/locale/es-AR/torbutton.dtd +++ b/chrome/locale/es-AR/torbutton.dtd @@ -36,9 +36,9 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript está deshabilitado por defecto en todos los sitios."> <!ENTITY torbutton.prefs.sec_limit_typography "Algunos tipos de letra y símbolos matemáticos están deshabilitados."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunos tipos de letra, iconos, símbolos matemáticos e imágenes están deshabilitados."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y video (medios HTML5) son cliquear-para-reproducir."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio y video (medios HTML5), y WebGL, deberán ser cliqueados para reproducirlos."> <!ENTITY torbutton.prefs.sec_custom_warning "Personalizado"> -<!ENTITY torbutton.prefs.sec_overview "Deshabilita ciertas funciones web que pueden usarse para atacar su seguridad y anonimato."> +<!ENTITY torbutton.prefs.sec_overview "Deshabilita ciertas funciones web que pueden usarse para atacar tu seguridad y anonimato."> <!ENTITY torbutton.prefs.sec_standard_tooltip "Nivel de Seguridad: Estándar"> <!ENTITY torbutton.prefs.sec_safer_tooltip "Nivel de Seguridad: Más Seguro"> <!ENTITY torbutton.prefs.sec_safest_tooltip "Nivel de Seguridad: El más Seguro"> @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Nuevo circuito para este sitio">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Solicitud de autenticación de cliente del servicio abierto de Onion"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Recuerda esta llave"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Abrir espera de comando para autenticación de cliente de servicio onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Recuerda esta clave"> diff --git a/chrome/locale/es-AR/torbutton.properties b/chrome/locale/es-AR/torbutton.properties index be31853d..581e0409 100644 --- a/chrome/locale/es-AR/torbutton.properties +++ b/chrome/locale/es-AR/torbutton.properties @@ -9,7 +9,7 @@ torbutton.circuit_display.guard = Guarda torbutton.circuit_display.guard_note = Tu nodo [Guarda] puede no cambiar. torbutton.circuit_display.learn_more = Más informacion torbutton.circuit_display.click_to_copy = Cliquear para copiar -torbutton.circuit_display.copied = Copiado! +torbutton.circuit_display.copied = ¡Copiado! torbutton.content_sizer.margin_tooltip = El Navegador Tor añade éste margen para hacer el ancho y alto de tu ventana menos distintivo, y de ésta manera reduce la habilidad de cualquiera para rastrearte en línea. torbutton.panel.tooltip.disabled = Cliquear para habilitar Tor torbutton.panel.tooltip.enabled = Cliquear para deshabilitar Tor @@ -72,73 +72,73 @@ onionServices.errorPage.onionSite=Sitio Onion # Tor SOCKS error 0xF0: onionServices.descNotFound.pageTitle=Problema al cargar el sitio Onion onionServices.descNotFound.header=Sitio Onion no encontrado -onionServices.descNotFound=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. +onionServices.descNotFound=La causa más probable es que el sitio Onion está fuera de línea. Ponete en contacto con el administrador del sitio Onion. onionServices.descNotFound.longDescription=Detalles:% S — El descriptor del servicio Onion solicitado no se puede encontrar en el hashring y, por lo tanto, el cliente no puede acceder al servicio. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=Problema al cargar el sitio Onion onionServices.descInvalid.header=No se puede acceder al sitio onion onionServices.descInvalid=No se puede acceder al sitio Onion debido a un error interno. -onionServices.descInvalid.longDescription= Detalles:% S — El descriptor del servicio de cebolla solicitado no se puede analizar o la validación de firma falló. +onionServices.descInvalid.longDescription=Detalles:% S — El descriptor del servicio onion solicitado no se puede descomponer o la validación de firma falló. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=Problema al cargar el sitio Onion onionServices.introFailed.header=El sitio Onion se ha desconectado -onionServices.introFailed=La causa más probable es que el sitio Onion está fuera de línea. Póngase en contacto con el administrador del sitio Onion. +onionServices.introFailed=La causa más probable es que el sitio Onion está fuera de línea. Ponete en contacto con el administrador del sitio Onion. onionServices.introFailed.longDescription=Detalles:%S — Falló la introducción, lo que significa que se encontró el descriptor pero el servicio ya no está conectado al punto de introducción. Es probable que el servicio haya cambiado su descriptor o que no se esté ejecutando. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=Problema al cargar el sitio Onion onionServices.rendezvousFailed.header=No se puede conectar al sitio Onio -onionServices.rendezvousFailed=El sitio Onion está ocupado o la red Tor está sobrecargada. Intenta nuevamente más tarde. +onionServices.rendezvousFailed=El sitio Onion está ocupado o la red Tor está sobrecargada. Intentá nuevamente más tarde. onionServices.rendezvousFailed.longDescription=Detalles:% S — El cliente no se pudo reunir con el servicio, lo que significa que el cliente no pudo finalizar la conexión. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=Autorización requerida onionServices.clientAuthMissing.header=El sitio Onion requiere autenticación onionServices.clientAuthMissing=El acceso al sitio Onion requiere una clave, pero no se proporcionó ninguna. -onionServices.clientAuthMissing.longDescription=Detalles:% S — El descriptor del servicio Onion solicitado no se puede analizar o la validación de firma falló. +onionServices.clientAuthMissing.longDescription=Detalles:% S — El cliente descargó el descriptor del servicio Onion solicitado, pero no pudo desencriptar su contenido porque falta información de autorización del cliente. # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=Autorización fallida onionServices.clientAuthIncorrect.header=Autenticación del sitio Onion fallida -onionServices.clientAuthIncorrect=La clave proporcionada es incorrecta o ha sido revocada. Póngase en contacto con el administrador del sitio Onion. -onionServices.clientAuthIncorrect.longDescription=Detalles:% S — El cliente pudo descargar el descriptor del servicio de Onion solicitado, pero no pudo descifrar su contenido utilizando la información de autorización del cliente proporcionada. Esto puede significar que el acceso ha sido revocado. +onionServices.clientAuthIncorrect=La clave proporcionada es incorrecta o ha sido revocada. Ponete en contacto con el administrador del sitio Onion. +onionServices.clientAuthIncorrect.longDescription=Detalles:% S — El cliente pudo descargar el descriptor del servicio Onion solicitado, pero no pudo desencriptar su contenido utilizando la información proporcionada de autorización del cliente. Esto puede significar que el acceso ha sido revocado. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=Problema al cargar el sitio Onion onionServices.badAddress.header=Dirección de sitio Onion no válida -onionServices.badAddress=La dirección del sitio Onion proporcionada no es válida. Por favor verifique que lo haya ingresado correctamente. -onionServices.badAddress.longDescription=Detalles:% S — La dirección .onion proporcionada no es válida. Este error se devuelve debido a uno de los siguientes motivos: la suma de verificación de la dirección no coincide, la clave pública ed25519 no es válida o la codificación no es válida. +onionServices.badAddress=La dirección del sitio Onion proporcionada no es válida. Por favor verifivá que la hayas ingresado correctamente. +onionServices.badAddress.longDescription=Detalles:% S — La dirección .onion proporcionada no es válida. Este error se devuelve debido a uno de los siguientes motivos: la suma de verificación de la dirección no coincide, la clave pública ed25519 no es válida, o la codificación no es válida. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Problema al cargar sitio Onion -onionServices.introTimedOut.header=El tiempo de creación del circuito de sitio Onion se agotó +onionServices.introTimedOut.header=El tiempo de creación para el circuito del sitio Onion se agotó onionServices.introTimedOut=No se pudo conectar al sitio Onion, posiblemente debido a una mala conexión de red. onionServices.introTimedOut.longDescription=Detalles: %S — El tiempo de espera de conexión al servicio Onion solicitado se agotó al intentar construir el circuito de encuentro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.authPrompt.description2=%S te está solicitando que te autentiques. -onionServices.authPrompt.keyPlaceholder=Ingrese su clave privada para este servicio Onion +onionServices.authPrompt.keyPlaceholder=Ingresá tu clave privada para este servicio Onion onionServices.authPrompt.done=Hecho -onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Ingrese una clave válida (52 Base32 caracteres o 44 Base64 caracteres) +onionServices.authPrompt.doneAccessKey=h +onionServices.authPrompt.invalidKey=Ingresá una clave válida (52 caracteres base32 o 44 caracteres base64) onionServices.authPrompt.failedToSetKey=No se puede configurar Tor con tu clave onionServices.authPreferences.header=Autenticación de servicios Onion -onionServices.authPreferences.overview=Algunos servicios Onion requieren que se identifique con una clave (un tipo de contraseña) antes de poder acceder a ellos. -onionServices.authPreferences.savedKeys=Claves guardadas ... +onionServices.authPreferences.overview=Algunos servicios Onion requieren que te identifiqués con una clave (un tipo de contraseña) antes de poder acceder a ellos. +onionServices.authPreferences.savedKeys=Claves guardadas... onionServices.authPreferences.dialogTitle=Claves de servicio Onion -onionServices.authPreferences.dialogIntro=Las claves para los siguientes sitios Onion se almacenan en su computadora +onionServices.authPreferences.dialogIntro=Las claves para los siguientes sitios Onion están almacenadas en tu computadora onionServices.authPreferences.onionSite=Sitio Onion onionServices.authPreferences.onionKey=Clave criptográfica onionServices.authPreferences.remove=Remover onionServices.authPreferences.removeAll=Remover todo -onionServices.authPreferences.failedToGetKeys=No se puede recuperar claves de Tor +onionServices.authPreferences.failedToGetKeys=Incapaz de recuperar las claves desde tor onionServices.authPreferences.failedToRemoveKey=No se puede eliminar la clave # Onion-Location strings. onionLocation.alwaysPrioritize=Siempre priorice las Onions -onionLocation.alwaysPrioritizeAccessKey=a +onionLocation.alwaysPrioritizeAccessKey=s onionLocation.notNow=Ahora no -onionLocation.notNowAccessKey=j +onionLocation.notNowAccessKey=a onionLocation.description=Hay una versión más privada y segura de este sitio disponible en la red Tor a través de servicios Onion. Los servicios Onion ayudan a los editores de sitios web y a sus visitantes a vencer la vigilancia y la censura. -onionLocation.tryThis=Prueba los servicios Onion +onionLocation.tryThis=Probá los servicios Onion onionLocation.onionAvailable=.onion disponible -onionLocation.learnMore=Aprende más… +onionLocation.learnMore=Aprendé más… onionLocation.always=Siempre -onionLocation.askEverytime=Pregunta cuando quieras -onionLocation.prioritizeOnionsDescription=Pregunta cuando quieras +onionLocation.askEverytime=Preguntá cuando quieras +onionLocation.prioritizeOnionsDescription=Priorizat sitios .onion cuando sean conocidos. onionLocation.onionServicesTitle=Servicios Onion

1 0

[tor-browser-build/maint-9.5] Add missing Changelog entry
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit f1f5c786f8faa841b54ec8b0f266922781aca018 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 07:30:32 2020 +0000 Add missing Changelog entry --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index cbd5459..922e875 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,8 @@ Tor Browser 9.5.4 -- August 25 2020 * Update NoScript to 11.0.38 * Windows + OS X + Linux * Bug 40019: Onion-Location should not be processed on .onion webpages [tor-browser] + * OS X + * Bug 40015: Tor Browser is broken on MacOS 11 Big Sur Tor Browser 9.5.3 -- July 28 2020 * All Platforms

1 0

[tor-browser-build/master] Bug 40038: Update geckoview to 80.0b2
by sysrqb＠torproject.org 19 Aug '20

19 Aug '20

commit 4e493106d3e9cad48529b2ea79bb29d3564474a9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 12 13:31:52 2020 +0000 Bug 40038: Update geckoview to 80.0b2 --- projects/geckoview/config | 8 ++++---- projects/geckoview/gradle-dependencies-list.txt | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index c046660..0b8f0c8 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,9 +8,9 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: '78.0b[% c("var/beta_version") %]' - beta_version: 5 - torbrowser_branch: 10 + geckoview_version: '80.0b[% c("var/beta_version") %]' + beta_version: 2 + torbrowser_branch: 10.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential @@ -26,7 +26,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 1 + gradle_dependencies_version: 2 steps: merge_aars: diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index d379d16..dc10fc5 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -140,6 +140,10 @@ dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca | https://jcent 321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk… 963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk… 8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk… +8940f7e0a2d740d3003e7b86865d5057f024dba04b5d4f8ac63ab9696d12162d | https://jcenter.bintray.com/org/checkerframework/checker-compat-qual/2.5.0/… +f386894973959e8f2cd02baa8742ff29f166cc9bd0be22282ccfe756ad22ebc2 | https://jcenter.bintray.com/org/checkerframework/checker-compat-qual/2.5.0/… +b414cd03e2256d201cf7f8531d8512497330d2dcc1d54c30167f2c12b94d9e6c | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.0/checker… +fb3c42e5c956d0d37b070a27183a96f917c63dff4574ca7bff7a9abd24827b43 | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.0/checker… 64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.2/checker… dc4cd438a36462d013c2338c8e206d102a322a00f33729e8955ee219859c9ede | https://jcenter.bintray.com/org/checkerframework/checker-qual/2.5.2/checker… 6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://jcenter.bintray.com/org/codehaus/codehaus-parent/4/codehaus-parent-… @@ -173,6 +177,8 @@ affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601 | https://jcent d83267404f53b7d95995cfac7723991e4761e702ae41a88703b1bd202bfcfa21 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/… 980965a550c50f424a2c6306dec7d5a0ac94a21e1aa8dbe87f7224774d44113c | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi… f00bc1f5e8d853238d7225ef503f3cc931d91dd1b37007d360f2c2d1b1eaad27 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotation-processi… +bf99f7935f6f9ad36339f04e22a4ca3725203036c018a86344271ec762e935f1 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3… +321458df7237ec2080a88fae01facd27a517f2d654c8ff549740d51844b5e912 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3… 602766a64424203122e9657545da958718f6dbda019081a4cd75047404d32363 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-build-common/1.3.41… fc33d0df31e9bbe6b67ff20dc211f396ac55dc350202834b85ecba0df81242e2 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-build-common/1.3.41… ea6ab03286a534ab24f123b845a107c7a53b679f6ee56bdc34b5dd1b0fd7b6f4 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-compiler-embeddable… @@ -273,8 +279,8 @@ c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550 | https://maven c7a7d3c2a9d6c21d8b6d470933b9472c733a4799b3ff702081b608adf1c7e592 | https://maven.google.com/android/arch/lifecycle/runtime/1.1.1/runtime-1.1.1… 7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a | https://maven.google.com/android/arch/lifecycle/viewmodel/1.1.1/viewmodel-1… deae2518ee1d17db319fbaf4055e32d591d58569eb9ccad53d8d323cf1840555 | https://maven.google.com/android/arch/lifecycle/viewmodel/1.1.1/viewmodel-1… -0baae9755f7caf52aa80cd04324b91ba93af55d4d1d17dcc9a7b53d99ef7c016 | https://maven.google.com/androidx/annotation/annotation/1.0.0/annotation-1.… -a179c12db43d9c0300c9db63f4811db496504be5401b951d422b78490ad1e5b4 | https://maven.google.com/androidx/annotation/annotation/1.0.0/annotation-1.… +d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | https://maven.google.com/androidx/annotation/annotation/1.1.0/annotation-1.… +2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | https://maven.google.com/androidx/annotation/annotation/1.1.0/annotation-1.… 52886c0ef6cfa492d07b40c3952201d6d2f0cfc680144fbefc69d2d5cb786c25 | https://maven.google.com/androidx/databinding/databinding-common/3.4.2/data… fb5c804e2d81186e9e63e45b7e97eec54aa6f5d502b763abfbb0c57b62b86b4c | https://maven.google.com/androidx/databinding/databinding-common/3.4.2/data… 770b6a82da0684f93d037ed5d241248cb25862ed14ecd7d9ec8c756153266051 | https://maven.google.com/androidx/databinding/databinding-compiler-common/3… @@ -475,5 +481,5 @@ c7786e12c89c77e4daea2ebb991491821f90364cd5e06a02b56371a42084b3c0 | https://maven 7031d2d09683996ac126074be3de6df9b3de80f7e0f10b80a6e8754f69c80028 | https://maven.google.com/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom ebec9d8e0a140b376aade276b08572cb1f8cf954249b469bee6dce6fd5a45cd4 | https://maven.google.com/com/android/tools/sdklib/26.4.2/sdklib-26.4.2.jar 768b365f2486e344d012d5b4b9b195fde8bfb442c23dca89d258a7766cdba5c8 | https://maven.google.com/com/android/tools/sdklib/26.4.2/sdklib-26.4.2.pom -42ebde4e470b5c09c8ef19d452fad3d70459a7a4a8f06ce20114a081343e7e0e | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.2.7/apilint-0.2… -f1efc89ead9ef1636f072654111abd650f3cb8ce7bb817ce99f15cd969ac3f6c | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.2.7/apilint-0.2… +ce1754a344bc0a38408b1c7310db652d3ec2aa97df42669cd9da167c6c9c7f7b | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.0/apilint-0.3… +e27acceb1ab0a6a490b91bf6112ff31605181db4255bed2039c98a965c5336f4 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.3.0/apilint-0.3…

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40038_v2'
by sysrqb＠torproject.org 19 Aug '20

19 Aug '20

commit 1db8a50c6936cd708e584be9a9e38b19b26b0730 Merge: 8b847bb 4e49310 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 19 22:18:08 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40038_v2' projects/geckoview/config | 8 ++++---- projects/geckoview/gradle-dependencies-list.txt | 14 ++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-)

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Bug 40090: Disable v3 add-on blocklist for now
by gk＠torproject.org 19 Aug '20

19 Aug '20

commit ee9af3088c44bba3280f76642efb50705155b902 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 19 10:38:48 2020 +0000 Bug 40090: Disable v3 add-on blocklist for now That's desktop-only as the v3 blocklist is not enabled on mobile yet, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1639050. --- browser/app/profile/firefox.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 531ac26f6db9..0f2c666201be 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -42,9 +42,9 @@ pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firef pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firef…"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition…"); -// Use bloomfilters for the addons blocklist, instead of JSON only. -pref("extensions.blocklist.useMLBF", true); -pref("extensions.blocklist.useMLBF.stashes", true); +// No bloomfilters for the addons blocklist for now, but JSON only. +pref("extensions.blocklist.useMLBF", false); +pref("extensions.blocklist.useMLBF.stashes", false); // The URL for the privacy policy related to recommended extensions. pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_med…");

1 0

[tor-browser-build/master] Fix typo
by gk＠torproject.org 19 Aug '20

19 Aug '20

commit 8b847bb022a3beeaf2bcc60069df02852280dad6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 19 11:06:01 2020 +0000 Fix typo Thanks cypherpunk --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a59abc2..096e0d7 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -58,7 +58,7 @@ Tor Browser 10.0a5 -- August 18 2020 * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave) * Build System * Windows + OS X + Linux - * Bug 31845: Bump GCC version for Linux to 9.3.0 + * Bug 31845: Bump GCC version to 9.3.0 * Bug 34011: Bump clang to 9.0.1 * Bug 34014: Enable sqlite3 support in Python * Bug 34390: Don't copy DBM libraries anymore

1 0

[tor-browser-build/master] Bump Go version to 1.13.15
by gk＠torproject.org 19 Aug '20

19 Aug '20

commit 5fa11f78a5cab9a205ac91482bbe19ef218ad4c7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 19 06:29:01 2020 +0000 Bump Go version to 1.13.15 --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index c0e3ee5..0188eb1 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.13.11 +version: 1.13.15 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 89ed1abce25ad003521c125d6583c93c1280de200ad221f961085200a6c00679 + sha256sum: 5fb43171046cf8784325e67913d55f88a683435071eef8e9da1aa8a1588fcf5d - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

[tor-browser-build/master] Fix typos
by gk＠torproject.org 19 Aug '20

19 Aug '20

commit b1e873013381a913e676cdc767f91720142f5f7e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 19 06:26:37 2020 +0000 Fix typos Reported by a cypherpunk, thanks! --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 987876d..a59abc2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -57,7 +57,7 @@ Tor Browser 10.0a5 -- August 18 2020 * OS X * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave) * Build System - * All Platforms + * Windows + OS X + Linux * Bug 31845: Bump GCC version for Linux to 9.3.0 * Bug 34011: Bump clang to 9.0.1 * Bug 34014: Enable sqlite3 support in Python @@ -74,7 +74,7 @@ Tor Browser 10.0a5 -- August 18 2020 * Bug 34230: Update Windows toolchain for Firefox 78 ESR * Bug 40015: Use only 64bit fxc2 [tor-browser-build] * Bug 40017: Enable stripping again on Windows [tor-browser-build] - * Bug 40061: Omit the Windows default browser agent from the build [tor-browser-build] + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] * OS X * Bug 34229: Update macOS toolchain for Firefox 78 ESR * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build]

1 0

[tor-browser-build/maint-9.5] Release prep for 9.5.4
by gk＠torproject.org 18 Aug '20

18 Aug '20

commit 665da21ee7ad20876ccc8d635ba100e6381ea42c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 18 09:58:01 2020 +0000 Release prep for 9.5.4 Changelog update and versions bump --- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 022eea9..5ef60e0 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.11.0 + firefox_platform_version: 68.12.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index a5be759..ec8669f 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.5.20 +version: 2020.8.13 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 0e14dae..cbd5459 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 9.5.4 -- August 25 2020 + * All Platforms + * Update Firefox to 68.12.0esr + * Update HTTPS Everywhere to 2020.08.13 + * Update NoScript to 11.0.38 + * Windows + OS X + Linux + * Bug 40019: Onion-Location should not be processed on .onion webpages [tor-browser] + Tor Browser 9.5.3 -- July 28 2020 * All Platforms * Update Firefox to 68.11.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 9254cf6..d913beb 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 759a38df3ef121804bf8933ab5289ec8452d5663fcad2f484b73095d8b488578 + sha256sum: 8cf8957dad3dc3aaad29f8cbeb8a519f364027e817a51f7bf64a0089036ce738 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 111ea70..9f6d6d3 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5.3' + torbrowser_version: '9.5.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5.1 + - 9.5.3 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.11.0esr-9.5-1] fixup! Bug 21952: Implement Onion-Location
by gk＠torproject.org 18 Aug '20

18 Aug '20

commit 2af44e4e4eab2c3d80625d5e4ddb69eaa4dd0432 Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 2 21:38:54 2020 +0200 fixup! Bug 21952: Implement Onion-Location --- dom/base/Document.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index 994f52659265..1a565a48f6dd 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3735,16 +3735,17 @@ void Document::GetHeaderData(nsAtom* aHeaderField, nsAString& aData) const { static bool IsValidOnionLocation(nsIURI* aDocumentURI, nsIURI* aOnionLocationURI) { bool isHttpish; - nsAutoCString onionHost; + nsAutoCString host; return aDocumentURI && aOnionLocationURI && NS_SUCCEEDED(aDocumentURI->SchemeIs("https", &isHttpish)) && - isHttpish && + isHttpish && NS_SUCCEEDED(aDocumentURI->GetAsciiHost(host)) && + !StringEndsWith(host, NS_LITERAL_CSTRING(".onion")) && ((NS_SUCCEEDED(aOnionLocationURI->SchemeIs("http", &isHttpish)) && isHttpish) || (NS_SUCCEEDED(aOnionLocationURI->SchemeIs("https", &isHttpish)) && isHttpish)) && - NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(onionHost)) && - StringEndsWith(onionHost, NS_LITERAL_CSTRING(".onion")); + NS_SUCCEEDED(aOnionLocationURI->GetAsciiHost(host)) && + StringEndsWith(host, NS_LITERAL_CSTRING(".onion")); } void Document::SetHeaderData(nsAtom* aHeaderField, const nsAString& aData) {

1 0

[tor-browser/tor-browser-80.0b2-10.0-1] Bug 40002: Remove about:pioneer
by gk＠torproject.org 17 Aug '20

17 Aug '20

commit f6194087a9b3f86784107028eaa9c5ac2736e7c2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 14 09:06:33 2020 -0400 Bug 40002: Remove about:pioneer Firefox Pioneer is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. --- browser/components/about/AboutRedirector.cpp | 2 -- browser/components/about/components.conf | 1 - 2 files changed, 3 deletions(-) diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 78cb284d3eda..0f81fab8d7f0 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -114,8 +114,6 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, - {"pioneer", "chrome://browser/content/pioneer.html", - nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, #ifdef TOR_BROWSER_UPDATE {"tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index d78de142e2e4..8e04467c05da 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -14,7 +14,6 @@ pages = [ 'logins', 'newinstall', 'newtab', - 'pioneer', 'pocket-saved', 'pocket-signup', 'policies',

1 0