August 2020 - tbb-commits - lists.torproject.org

[tor-browser-build/master] fixup! Bug 40027: Fix incremental .mar creation for esr78
by gk＠torproject.org 27 Aug '20

27 Aug '20

commit 81bae4ade31e803fb3627ad0283e020331d1a21c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 24 17:41:58 2020 +0000 fixup! Bug 40027: Fix incremental .mar creation for esr78 --- tools/update-responses/update_responses | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index de703ee..b07d937 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -230,8 +230,8 @@ sub create_incremental_mar { exit_error "Missing code signature while creating $mar_file"; } } - $ENV{MOZ_PRODUCT_VERSION} = $new_version; - $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{MOZ_PRODUCT_VERSION} = $new_version; + local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) {

1 0

[torbutton/master] Bug 40006: Fix new identity for 81
by gk＠torproject.org 27 Aug '20

27 Aug '20

commit 72cbb6d501aa798a676da9331e686581ee4038cf Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 26 12:29:31 2020 +0200 Bug 40006: Fix new identity for 81 New identity tries to disable some buttons to prevent them from being clicked while doing a new identity. These are now initialized lazily, which makes the current code fail. Instead of doing that, we now avoid disabling the buttons and ignore new identity requests while one is in progress. --- chrome/content/torbutton.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 0d2e7e2d..a9d4ccd1 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -760,15 +760,18 @@ torbutton_new_circuit = function() { gBrowser.reloadWithFlags(Ci.nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE); } +let newIdentityInProgress = false; + // Bug 1506 P4: Needed for New Identity. torbutton_new_identity = async function() { try { - // Make sure that we can only click once on New Identiy to avoid race + // Ignore if there's a New Identity in progress to avoid race // conditions leading to failures (see bug 11783 for an example). - // TODO: Remove the Torbutton menu entry again once we have done our - // security control redesign. - document.getElementById("menu_newIdentity").disabled = true; - document.getElementById("appMenuNewIdentity").disabled = true; + if (newIdentityInProgress) { + return; + } + + newIdentityInProgress = true; let shouldConfirm = m_tb_prefs.getBoolPref("extensions.torbutton.confirm_newnym"); @@ -789,14 +792,9 @@ torbutton_new_identity = async function() { if (confirmed) { await torbutton_do_new_identity(); - } else { - // TODO: Remove the Torbutton menu entry again once we have done our - // security control redesign. - document.getElementById("menu_newIdentity").disabled = false; - document.getElementById("appMenuNewIdentity").disabled = false; } } else { - await torbutton_do_new_identity(); + await torbutton_do_new_identity(); } } catch(e) { // If something went wrong make sure we have the New Identity button @@ -805,8 +803,8 @@ torbutton_new_identity = async function() { // security control redesign. torbutton_log(5, "Unexpected error on new identity: " + e); window.alert("Torbutton: Unexpected error on new identity: " + e); - document.getElementById("menu_newIdentity").disabled = false; - document.getElementById("appMenuNewIdentity").disabled = false; + } finally { + newIdentityInProgress = false; } }

1 0

[tor-browser-build/master] Bug 40031: Add licenses for kcp-go and smux.
by gk＠torproject.org 26 Aug '20

26 Aug '20

commit bdcf6b3b2b330e40260a0d17742ec37a890365fd Author: David Fifield <david(a)bamsoftware.com> Date: Tue Aug 25 20:15:53 2020 -0600 Bug 40031: Add licenses for kcp-go and smux. kcp-go$ git show 831b5b267373f6fbd3548849a3925c4e70806de2:LICENSE smux$ git show c6969d8a76874342611f4b544d05b1590f1a76b1:LICENSE --- .../Docs/Licenses/PluggableTransports/LICENSE | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE index d216374..fd0dbd6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE +++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE @@ -210,3 +210,55 @@ To the extent possible under law, the authors have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any warranty. See LICENSE.CC0. + +=============================================================================== + +xtaci/kcp-go + +The MIT License (MIT) + +Copyright (c) 2015 Daniel Fu + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +=============================================================================== + +xtaci/smux + +MIT License + +Copyright (c) 2016-2017 Daniel Fu + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.

1 0

[tor-browser-build/maint-9.5] Add repo for macOS Big Sur fix
by gk＠torproject.org 25 Aug '20

25 Aug '20

commit 0374ac5abf3927c23f06cc8f48198420df74e56e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 25 14:33:21 2020 +0000 Add repo for macOS Big Sur fix --- 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 922e875..6186d71 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,7 @@ Tor Browser 9.5.4 -- August 25 2020 * 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 + * Bug 40015: Tor Browser is broken on MacOS 11 Big Sur [tor-browser] Tor Browser 9.5.3 -- July 28 2020 * All Platforms

1 0

[tor-browser-build/master] Bug 40046: Use Go 1.14.x series
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 2ed67f3368a9de4822ba30714f4f1c8e594454ca Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 22 14:03:20 2020 +0000 Bug 40046: Use Go 1.14.x series Specifically, use Go 1.14.7 for now. Thanks, cypherpunk, for the reminder. --- projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 0188eb1..24ab09a 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.13.15 +version: 1.14.7 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: 5fb43171046cf8784325e67913d55f88a683435071eef8e9da1aa8a1588fcf5d + sha256sum: 064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959

1 0

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

24 Aug '20

commit 4cc1216668d26fb209b480e898ec1f6ef8958d75 Merge: 4861f97 2ed67f3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Aug 24 18:56:34 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40046_v2' projects/go/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[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