- tbb-commits - lists.torproject.org

[tor-browser-spec/master] Bug 40001: Add rebasing process document
by gk＠torproject.org 06 Jul '20

06 Jul '20

commit f857ef5ae6c8af955198bd28c7b54bf7df624b53 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 22 18:17:44 2020 +0200 Bug 40001: Add rebasing process document --- processes/Rebasing | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/processes/Rebasing b/processes/Rebasing new file mode 100644 index 0000000..144f5ab --- /dev/null +++ b/processes/Rebasing @@ -0,0 +1,161 @@ +Rebasing Tor Browser patches on top of a new Firefox version +============================================================ + +These instructions assume branches of Tor Browser code are maintained with git, +and consist of a sequence of patches (commits) applied on top of some commit +from the https://github.com/mozilla/gecko-dev.git mirror of the Mercurial +Gecko repositories. + +1) Rebase +--------- + +This consists of applying the Tor Browser patches (commits) from some branch on +top of a newer Firefox branch, and fixing up possible conflicts. There should be +a helper script that automates as much of this process as possible: + +Steps: + +- Move to the branch that contains the patches to be rebased and create a new + one, since it will be modified during the rebasing process: + `git checkout [current_tor_browser_branch] -b [new_rebased_branch_name]` +- Execute the rebase helper script: `./git-tbrebase [target_firefox_branch]`. + Responsibilities of the script: + - Get the list of Tor Browser patches from `current_tor_browser_branch`. + - Check whether some of the patches are already in `target_firefox_branch` + (e.g. backports) and mark them to be skipped in that case. + - Move to `target_firefox_branch` (e.g. + `git reset --hard [target_firefox_branch]`) and apply patches. + - Keep a log of all the process in a way that it can be used as a "rebase + report" for the reviewer. + - This should include, among other things, the time needed for resolving + patch conflicts. + - For each conflict, show the bugzilla tickets responsible for it, based on + `git blame` on the conflicting lines. + - After resolving a patch conflict, ask the rebaser whether comments need to + be added, and make sure these are included in the "rebase report". + - If there are patches that require manual steps when rebasing (e.g. copying + nightly branding folder to alpha, etc.), stop and warn about it. + - There could be instructions encoded in the commit message using some + convention. + - Or maybe run some script automatically, similarly to git hooks. +- In case of conflict: + - Resolve manually. + - Check whether the commit message needs to be changed due to the conflict + resolution (e.g. a partially uplifted patch), and do so if needed. + - Run `./git-tbrebase --continue` to continue with the process (or `--skip` or + `--abort`, similarly to `git rebase`). + +2) Build +-------- + +Ideally, we should do a full tor-browser-build here. But: + +- These can take quite long, and are not incremental. +- The `tor-browser-build` toolchains might need changes for newer Firefox + versions. + +At this stage, it should be fine to do a local build and use a `repackage_tb` +script which takes the latest linux64 Tor Browser build and repackages it with +the locally built Tor Browser from `obj-x86_64-pc-linux-gnu`. + +Steps: + +- Copy `tor-launcher` master to `browser/extensions`. +- Make sure `torbutton` submodule is correctly loaded: + `git submodule update --init` +- Edit `.mozconfig` to set + - `ac_add_options --enable-tests` + - `ac_add_options --enable-debug` + - `ac_add_options --enable-tor-launcher` + - `ac_add_options --enable-tor-browser-update` +- Optionally, add + `ac_add_options --with-ccache=/home/user/.mozbuild/sccache/sccache` to use + `sccache` for speeding up subsequent builds. +- `./mach build && ./mach package` +- `./repackage_tb` + +At the end, there should be a `tor-browser-linux64-version_en-US.tar.xz` +artifact, which is the repackaged Tor Browser. + +3) Manual testing +----------------- + +This should ideally not be needed, but until everything is covered by automated +testing we can do a quick manual test to catch the most obvious breakage: + +- Launch the repackaged browser and check: + - Tor is launched correctly. + - `about:tor` is displayed with no errors + - `about:preferences` is not broken. + - It's possible to navigate to some website (e.g. duckduckgo search) + - The circuit display is working and displayed correctly. + +4) Automated testing +-------------------- + +There should be a single script that runs all tests, but for now let's +list the individual commands: + +- `./run-tbb-tests` should run the Tor Browser unit tests locally. +- + `./tor-browser-bundle-testsuite/tbb-testsuite --no-xdummy tor-browser-linux64-version_en-US.tar.xz` + should run the Tor Browser testsuite. +- `./mach lint` should check for linting errors. + +5) Debug/Fix +------------ + +For each issue found while running tests, debug and/or fix it, then iterate 2-5 +until no more test failures are found. + +For fixing up a commit, a script `./git-tbedit [commit]` should be used, so that +the time spent editing the patch is tracked and included in the rebase report. + +6) Push for review +------------------ + +In the ticket for the rebase work, the rebaser should add a reference to the +rebased branch that has to be reviewed, and a rebase report, which should +contain, for every Tor Browser commit in the original branch: + +``` +[SKIPPED|PICKED|CONFLICT][original_hash][commit_summary] + (optional) Total time editing commit: + (optional) Comments: + Some comments relevant for the reviewer. + (optional) Conflicts: + List of conflicting files. +``` + +Other +----- + +- Picking Tor Browser patches and changes that landed after the rebase started. + +The rebasing and reviewing process can last long enough for newer patches and +changes to have landed after the process started. + +Doing a full rebase with a later tor-browser branch would be too costly, so we +need to identify the changes that landed between the branch that was originally +rebased and the newer Tor Browser branch and only apply those. + +Until this is properly automated, a suggested manual approach is to do: + +`git range-diff original_starting_commit~1..original_ending_commit new_starting_commit~1..new_ending_commit`, +so basically doing a range-diff between the original set of patches that were +rebased, and a more up-to-date set of patches. Then, we should manually be able +to pick the missing changes, as fixup or squash commits. + +- Reordering/squashing patches + +We should not mix rebasing changes + fixing conflicts with patch reordering and +squashing. More concretely, it should be possible to check with +`git diff original_tb_branch..reordered_and_squashed_tb_branch` that the +reordered branch contents are equivalent to the previous branch. + +- Double-checking that no patch was accidentally lost in the process + +While this should not be possible if most of the process is properly automated, +it should not be very costly to double-check it. For this, there could be a +script that compares the current rebased branch with the latest tor-browser +branch, and shows the differences (comparing the set of commit messages).

1 0

[tor-browser-spec/master] Change torbutton fixup instructions in ReleaseProcess
by gk＠torproject.org 03 Jul '20

03 Jul '20

commit 031a48a9c00b24ac6d71649e892fd306713276ca Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 3 12:57:24 2020 +0200 Change torbutton fixup instructions in ReleaseProcess --- processes/ReleaseProcess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 1c2076e..563f263 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -7,7 +7,8 @@ # In particular: before tagging the tor-browser tag, the final code from # Torbutton needs to get included and in order to avoid unnecessary commit # inflation the commit for bumping the git submodule should be a fixup commit -# to the one with "Pick up latest Torbutton code" in its commit message. +# to the one with "Bug 25013: Add torbutton as a tor-browser submodule" in +# its commit message. #. Update changelog and relevant config files in tor-browser-build. cd tor-browser-build

1 0

[tor-browser-build/master] Fold in 9.5.1 Changelog
by gk＠torproject.org 01 Jul '20

01 Jul '20

commit 860a8a38dbca4c9e1ce21277f51860d194aec8d8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 1 10:19:19 2020 +0000 Fold in 9.5.1 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index e9126c2..fd03cd1 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,19 @@ Tor Browser 10.0a2 -- June 30 2020 * Android * Bug 34372: Disable GeckoNetworkManager +Tor Browser 9.5.1 -- June 30 2020 + * All Platforms + * Update Firefox to 68.10.0esr + * Update NoScript to 11.0.32 + * Translations update + * Bug 40009: Improve tor's client auth stability + * Windows + OS X + Linux + * Bug 34361: "Prioritize .onion sites when known" appears under General + * Bug 34362: Improve Onion Service Authentication prompt + * Bug 34369: Fix learn more link in Onion Auth prompt + * Bug 34379: Fix learn more for Onion-Location + * Bug 34347: The Tor Network part on the onboarding is not new anymore + Tor Browser 10.0a1 -- June 2 2020 * All Platforms * Update Firefox to 68.9.0esr

1 0

[tor-browser-build/master] Release preparations for 10.0a2
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit a0cf2d77e652d2c5188c1e11b613d04e5d47da1b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jun 26 17:56:29 2020 +0000 Release preparations for 10.0a2 Versions bump and Changelog update. --- projects/firefox/config | 2 +- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- rbm.conf | 4 ++-- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index a64763e..019dfc1 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.9.0 + firefox_platform_version: 68.10.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/tba-translation/config b/projects/tba-translation/config index ab5c04e..520f570 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd +git_hash: e93401f698cca39971395625e1f8de54b978ab88 version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 224248c..e9126c2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,20 @@ +Tor Browser 10.0a2 -- June 30 2020 + * All Platforms + * Update Firefox to 68.10.0esr + * Update NoScript to 11.0.32 + * Update Tor to 0.4.4.1-alpha + * Translations update + * Bug 34209: about:tor and about:tbupdate fail to load in debug build + * Bug 34250: Only listen to 'started' in noscript-control.js + * Bug 34383: Accept request if GetHost() in mixed content blocking check fails + * Windows + OS X + Linux + * Bug 34361: "Prioritize .onion sites when known" appears under General + * Bug 34362: Improve Onion Service Authentication prompt + * Bug 34369: Fix learn more link in Onion Auth prompt + * Bug 34379: Fix learn more for Onion-Location + * Android + * Bug 34372: Disable GeckoNetworkManager + Tor Browser 10.0a1 -- June 2 2020 * All Platforms * Update Firefox to 68.9.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 809bfa0..da6e40b 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: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8 + sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor/config b/projects/tor/config index 912f839..72d7a8a 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.5 +version: 0.4.4.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index d0afe9a..0ccfc9d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a1' + torbrowser_version: '10.0a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a13 + - 10.0a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] Merge remote-tracking branch 'gk/bug_34372_v2' into tor-browser-68.9.0esr-10.0-1
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit 4a1c5a32c190b219c3c520a72710aa2ff7b5f3f5 Merge: a745de73db61 4912857cacd8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jun 26 18:30:04 2020 +0000 Merge remote-tracking branch 'gk/bug_34372_v2' into tor-browser-68.9.0esr-10.0-1 .../geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 25741 - TBA: Disable GeckoNetworkManager
by sysrqb＠torproject.org 26 Jun '20

26 Jun '20

commit 4912857cacd85b02787a90b8939024b56d2b8cd1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 10 12:46:33 2020 +0000 fixup! Bug 25741 - TBA: Disable GeckoNetworkManager Bug 34372: Disable GeckoNetworkManager We should only start and stop the network manager if we are *not* Tor Browser. --- .../geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java index 804b8f0000e9..6d28d919f8c4 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java @@ -118,7 +118,7 @@ public final class GeckoRuntime implements Parcelable { Log.d(LOGTAG, "Lifecycle: onResume"); // Monitor network status and send change notifications to Gecko // while active. - if (BuildConfig.TOR_BROWSER_VERSION != "") { + if (BuildConfig.TOR_BROWSER_VERSION == "") { GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext()); } } @@ -127,7 +127,7 @@ public final class GeckoRuntime implements Parcelable { void onPause() { Log.d(LOGTAG, "Lifecycle: onPause"); // Stop monitoring network status while inactive. - if (BuildConfig.TOR_BROWSER_VERSION != "") { + if (BuildConfig.TOR_BROWSER_VERSION == "") { GeckoNetworkManager.getInstance().stop(); } }

1 0

[tor-browser-build/maint-9.5] Pickup build2 for client auth stability
by sysrqb＠torproject.org 24 Jun '20

24 Jun '20

commit e94ba3a7677f7051a14b2304427ec8393a450fdc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 20:11:37 2020 +0000 Pickup build2 for client auth stability --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 3e8689b..c65d3a8 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5.1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5 project_name: tor-browser

1 0

[tor-browser-build/maint-9.5] Bug 40009: Improve tor's client auth stability
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit bf0065b5c36c6b37fd493e408c220c7757c8eeec Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 18:38:18 2020 +0000 Bug 40009: Improve tor's client auth stability --- ...ve-accessor-semantic-of-client-cached-obj.patch | 212 +++++++++++++++++++++ projects/tor/build | 4 + projects/tor/config | 1 + 3 files changed, 217 insertions(+) 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 new file mode 100644 index 0000000..1432039 --- /dev/null +++ b/projects/tor/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch @@ -0,0 +1,212 @@ +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 + diff --git a/projects/tor/build b/projects/tor/build index 30ecc7e..012ec98 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -91,6 +91,10 @@ openssldir=/var/tmp/dist/openssl/openssl [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] + +# Cherry-pick patch until 0.4.3.6 is released. +patch -p1 < $rootdir/0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch + # add git hash to micro-revision.i for #24995 echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh diff --git a/projects/tor/config b/projects/tor/config index 912f839..1f57465 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -68,3 +68,4 @@ input_files: - name: zstd project: zstd enable: '[% c("var/android") %]' + - filename: 0001-hs-v3-Improve-accessor-semantic-of-client-cached-obj.patch

1 0

[tor-browser-build/maint-9.5] Add #40009 in ChangeLog
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit e6b52336481796573e88e082c15142370a4ee8ae Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 19:37:04 2020 +0000 Add #40009 in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7a589d9..c204a38 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser 9.5.1 -- June 30 2020 * Update Firefox to 68.10.0esr * Update NoScript to 11.0.32 * Translations update + * Bug 40009: Improve tor's client auth stability * Windows + OS X + Linux * Bug 34361: "Prioritize .onion sites when known" appears under General * Bug 34362: Improve Onion Service Authentication prompt

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit a745de73db61e6654554109b06ece81329a9244d Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jun 24 15:03:42 2020 +0200 fixup! Bug 23247: Communicating security expectations for .onion Fixes bug 34383. --- dom/security/nsMixedContentBlocker.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp index 2bbc2e8aecb3..fecbd5552ec3 100644 --- a/dom/security/nsMixedContentBlocker.cpp +++ b/dom/security/nsMixedContentBlocker.cpp @@ -746,16 +746,7 @@ nsresult nsMixedContentBlocker::ShouldLoad( return NS_OK; } if (!parentIsHttps) { - nsAutoCString parentHost; - rv = innerRequestingLocation->GetHost(parentHost); - if (NS_FAILED(rv)) { - NS_ERROR("requestingLocation->GetHost failed"); - *aDecision = REJECT_REQUEST; - return NS_OK; - } - - bool parentIsOnion = - StringEndsWith(parentHost, NS_LITERAL_CSTRING(".onion")); + bool parentIsOnion = IsPotentiallyTrustworthyOnion(innerRequestingLocation); if (!parentIsOnion) { *aDecision = ACCEPT; return NS_OK;

1 0

[tor-browser-build/maint-9.5] Bug 40008: Update sysrqb's key and subkeys
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit dc292d9cf92762533328169e586a96113a035ef3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 15:08:01 2020 +0000 Bug 40008: Update sysrqb's key and subkeys --- keyring/torbutton.gpg | Bin 125829 -> 132637 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 8ace7fd..b587a66 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser-build/master] Bug 40008: Update sysrqb's key and subkeys
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit f3872586e5b2ed57c41480f5ee0e12e12200a36f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jun 24 15:08:01 2020 +0000 Bug 40008: Update sysrqb's key and subkeys --- keyring/torbutton.gpg | Bin 125829 -> 132637 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index 8ace7fd..b587a66 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser-build/maint-9.5] All platforms covers Android for translations
by gk＠torproject.org 24 Jun '20

24 Jun '20

commit ae0a27b74bbc1acec6a6ca38f91d95ef04394837 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 24 07:53:50 2020 +0000 All platforms covers Android for translations --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 419bb80..7a589d9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,8 +9,6 @@ Tor Browser 9.5.1 -- June 30 2020 * Bug 34369: Fix learn more link in Onion Auth prompt * Bug 34379: Fix learn more for Onion-Location * Bug 34347: The Tor Network part on the onboarding is not new anymore - * Android - * Translations update Tor Browser 9.5 -- June 2 2020 * All Platforms

1 0

[tor-browser-build/maint-9.5] New NoScript version, TB tag, and Changelog
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit acbe3a6a21b0ee834374ace05b0cb8c86112a0a0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 20:29:09 2020 +0000 New NoScript version, TB tag, and Changelog --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++- projects/tor-browser/config | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index b5d3d08..1398149 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a893105..419bb80 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,12 +1,14 @@ Tor Browser 9.5.1 -- June 30 2020 * All Platforms * Update Firefox to 68.10.0esr - * Update NoScript to 11.0.31 + * Update NoScript to 11.0.32 + * Translations update * Windows + OS X + Linux * Bug 34361: "Prioritize .onion sites when known" appears under General * Bug 34362: Improve Onion Service Authentication prompt * Bug 34369: Fix learn more link in Onion Auth prompt * Bug 34379: Fix learn more for Onion-Location + * Bug 34347: The Tor Network part on the onboarding is not new anymore * Android * Translations update diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 697f737..6bd09de 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: 16691879de18566c01d5ae9fcdfde183ab645ee6580cae2ee5a37770deac375f + sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser/tor-browser-68.10.0esr-9.5-1] fixup! Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit 75c2bb720d4ceb76231e8ecc3455754bf05ba19b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 13:24:39 2020 +0000 fixup! Bug 34321 - Add Learn More onboarding item --- browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 2115b2bd9d27..b411a3039a3e 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -124,7 +124,6 @@ var onboardingTourset = { "tor-network-9.0": { id: "onboarding-tour-tor-network-9-0", tourNameId: "onboarding.tour-tor-network", - highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); @@ -249,7 +248,6 @@ var onboardingTourset = { "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", tourNameId: "onboarding.tour-tor-toolbar", - highlightId: "onboarding.tour-tor-update.prefix-updated", getPage(win) { let div = win.document.createElement("div");

1 0

[tor-browser/tor-browser-68.10.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit fd82aba0467c49f6561ac73a73f7ec9def5413ef Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 20:11:52 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 605e9d398ab0..ebe2bedab44e 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 605e9d398ab026ce53ec8ad106848bfe5ae5e627 +Subproject commit ebe2bedab44e38f18c7968bd327d99eef7660f34

1 0

[torbutton/maint-9.5] Translations update
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit ebe2bedab44e38f18c7968bd327d99eef7660f34 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 12 13:20:03 2020 +0000 Translations update --- chrome/locale/ar/torbutton.properties | 2 +- chrome/locale/bn-BD/torbutton.properties | 2 +- chrome/locale/ca/torbutton.properties | 2 +- chrome/locale/cs/torbutton.dtd | 2 +- chrome/locale/cs/torbutton.properties | 68 ++++++++++----------- chrome/locale/da/torbutton.properties | 2 +- chrome/locale/de/torbutton.properties | 2 +- chrome/locale/el/aboutTor.dtd | 2 +- chrome/locale/el/browserOnboarding.properties | 8 +-- chrome/locale/el/torbutton.dtd | 6 +- chrome/locale/el/torbutton.properties | 26 ++++---- chrome/locale/es-AR/torbutton.properties | 2 +- chrome/locale/es-ES/torbutton.properties | 2 +- chrome/locale/eu/torbutton.properties | 2 +- chrome/locale/fa/torbutton.properties | 2 +- chrome/locale/fr/torbutton.properties | 2 +- chrome/locale/ga-IE/torbutton.properties | 2 +- chrome/locale/he/torbutton.properties | 2 +- chrome/locale/hu/torbutton.properties | 2 +- chrome/locale/id/torbutton.properties | 2 +- chrome/locale/is/torbutton.properties | 2 +- chrome/locale/it/torbutton.properties | 2 +- chrome/locale/ja/aboutTor.dtd | 8 +-- chrome/locale/ja/torbutton.dtd | 4 +- chrome/locale/ja/torbutton.properties | 88 +++++++++++++-------------- chrome/locale/ka/torbutton.properties | 4 +- chrome/locale/ko/aboutTor.dtd | 2 +- chrome/locale/ko/torbutton.properties | 2 +- chrome/locale/lt/torbutton.properties | 2 +- chrome/locale/mk/torbutton.properties | 2 +- chrome/locale/ms/torbutton.properties | 2 +- chrome/locale/nb-NO/torbutton.properties | 2 +- chrome/locale/nl/torbutton.properties | 2 +- chrome/locale/pl/torbutton.properties | 2 +- chrome/locale/pt-BR/torbutton.properties | 2 +- chrome/locale/ro/torbutton.properties | 2 +- chrome/locale/ru/torbutton.properties | 2 +- chrome/locale/sv-SE/torbutton.properties | 2 +- chrome/locale/th/torbutton.properties | 2 +- chrome/locale/tr/torbutton.properties | 2 +- chrome/locale/vi/torbutton.properties | 2 +- chrome/locale/zh-CN/torbutton.properties | 2 +- chrome/locale/zh-TW/torbutton.properties | 2 +- 43 files changed, 141 insertions(+), 141 deletions(-) diff --git a/chrome/locale/ar/torbutton.properties b/chrome/locale/ar/torbutton.properties index 80a2f37a..23b34ec5 100644 --- a/chrome/locale/ar/torbutton.properties +++ b/chrome/locale/ar/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S يطلب المفتاح الخاص بكم +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=يرجى إدخال المفتاح الخاص لخدمة البصلة هذه onionServices.authPrompt.done=انتهى onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/bn-BD/torbutton.properties b/chrome/locale/bn-BD/torbutton.properties index 68a14850..fb43f5c0 100644 --- a/chrome/locale/bn-BD/torbutton.properties +++ b/chrome/locale/bn-BD/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S আপনার ব্যক্তিগত কীটির জন্য অনুরোধ করছে। +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=এই onion পরিষেবার জন্য আপনার ব্যক্তিগত কী লিখুন onionServices.authPrompt.done=সম্পন্ন onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/ca/torbutton.properties b/chrome/locale/ca/torbutton.properties index 6b31ae30..e6480677 100644 --- a/chrome/locale/ca/torbutton.properties +++ b/chrome/locale/ca/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S sol·licita la vostra clau privada. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Introduïu la vostra clau privada per a aquest servei ceba onionServices.authPrompt.done=Fet onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/cs/torbutton.dtd b/chrome/locale/cs/torbutton.dtd index b55de660..d273f72b 100644 --- a/chrome/locale/cs/torbutton.dtd +++ b/chrome/locale/cs/torbutton.dtd @@ -50,4 +50,4 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Otevřít výzvu k ověření klienta služby onion"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Zapamatovat si tento klíč"> diff --git a/chrome/locale/cs/torbutton.properties b/chrome/locale/cs/torbutton.properties index 6c86b1fb..dcfc6952 100644 --- a/chrome/locale/cs/torbutton.properties +++ b/chrome/locale/cs/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Neznámá země torbutton.circuit_display.guard = Ochrana torbutton.circuit_display.guard_note = Váš uzel typu Ochrana se nemusí změnit. torbutton.circuit_display.learn_more = Zjistit více -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Kliknutím zkopírujte +torbutton.circuit_display.copied = Zkopírováno! torbutton.content_sizer.margin_tooltip = Prohlížeč Tor upravuje velikost vašeho okna, aby znesnadnil možnost vašeho vysledování. torbutton.panel.tooltip.disabled = Klepněte pro zapnutí Toru torbutton.panel.tooltip.enabled = Klepněte pro vypnutí Toru @@ -60,58 +60,58 @@ updateDownloadingPanelUILabel=Stahování aktualizace pro %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Šifrované spojení (Onion služba, %1$S, %2$S bitové klíče, %3$S) pageInfo_OnionEncryption=Šifrované spojení (Onion služba) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Onion Název: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Zjistit více onionServices.errorPage.browser=Prohlížeč onionServices.errorPage.network=Síť -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Onionsíť # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.pageTitle=Problém při načítání Onionsítě +onionServices.descNotFound.header=Onionsíť nebyla nalezena +onionServices.descNotFound=Nejpravděpodobnější příčina je, že onionsíť je offline. Kontaktuje administrátora onionsítě. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. +onionServices.descInvalid.pageTitle=Problém při načítání Onionsítě +onionServices.descInvalid.header=Onionsíť nemůže být dosažena +onionServices.descInvalid=Onionsíť je nedostupná kvůli interní chybě. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.pageTitle=Problém při načítání Onionsítě +onionServices.introFailed.header=Onionsíť byla odpojena +onionServices.introFailed=Nejpravděpodobnější příčina je, že onionsíť je offline. Kontaktuje administrátora onionsítě. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.pageTitle=Problém při načítání Onionsítě +onionServices.rendezvousFailed.header=Připojení k Onionsíti není možné +onionServices.rendezvousFailed=Onionsíť je zaneprázdněná, nebo je síť Tor přetížená. Zkuste to později. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +onionServices.clientAuthMissing.pageTitle=Je vyžadováno oprávnění +onionServices.clientAuthMissing.header=Onionsíť vyžaduje autentizaci. +onionServices.clientAuthMissing=Přístup k onionsíti vyžaduje klíč, ale žádný nebyl poskytnut. onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed +onionServices.clientAuthIncorrect.pageTitle=Autorizace selhala. onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +onionServices.clientAuthIncorrect=Poskytnutý klíč je nesprávný, nebo byl zrušen. Kontaktujte administrátora onionsítě. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address +onionServices.badAddress.pageTitle=Problém při načítání Onionsítě +onionServices.badAddress.header=Neplatná adresa Onionsítě onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=Problém při načítání Onionsítě onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S vyžaduje váš soukromý klíč. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Zadejte svůj soukromý klíč pro tuto službu onion onionServices.authPrompt.done=Hotovo onionServices.authPrompt.doneAccessKey=H @@ -119,13 +119,13 @@ onionServices.authPrompt.invalidKey=Zadejte prosím platný klíč (52 znaků ba onionServices.authPrompt.failedToSetKey=Tor s vaším klíčem nelze nastavit onionServices.authPreferences.header=Onion Services Authentication onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.savedKeys=Uložené klíče... +onionServices.authPreferences.dialogTitle=Klíče Služby Onion +onionServices.authPreferences.dialogIntro=Klíče pro následující onion stánky jsou uloženy na vašem počítači +onionServices.authPreferences.onionSite=Onionsíť onionServices.authPreferences.onionKey=Klíč onionServices.authPreferences.remove=Odstranit -onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.removeAll=Odstranit všechny onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor onionServices.authPreferences.failedToRemoveKey=Unable to remove key @@ -135,10 +135,10 @@ onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=Nyní ne onionLocation.notNowAccessKey=n onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services +onionLocation.tryThis=Vyzkoušet Onion Služby onionLocation.onionAvailable=.onion available onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.always=Vždy +onionLocation.askEverytime=Ptát se vždy +onionLocation.prioritizeOnionsDescription=Upřednostňovat známé .onion stránky. onionLocation.onionServicesTitle=Služby Onion diff --git a/chrome/locale/da/torbutton.properties b/chrome/locale/da/torbutton.properties index 30d4e0fc..775c35ab 100644 --- a/chrome/locale/da/torbutton.properties +++ b/chrome/locale/da/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Kunne ikke oprette forbindelse til onionstedet, muli onionServices.introTimedOut.longDescription=Detaljer: %S — Forbindelsen til den anmodede oniontjeneste fik timeout mens rendezvous-kredsløbet blev forsøgt bygget. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S anmoder om din private nøgle. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Indtast din private nøgle til oniontjenesten onionServices.authPrompt.done=Færdig onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/de/torbutton.properties b/chrome/locale/de/torbutton.properties index 50cac4ab..06ea9001 100644 --- a/chrome/locale/de/torbutton.properties +++ b/chrome/locale/de/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Verbindung zur Onion-Site ist fehlgeschlagen, mögli onionServices.introTimedOut.longDescription=Details: %S — Die Verbindung zum angeforderten Onion-Dienst ist beim Versuch, den Rendezvous-Kanal aufzubauen, abgelaufen. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S fragt deinen privaten Schlüssel an. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Gib deinen privaten Schlüssel für diesen Onion-Dienst ein. onionServices.authPrompt.done=Fertig onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/el/aboutTor.dtd b/chrome/locale/el/aboutTor.dtd index e76166fd..6c086733 100644 --- a/chrome/locale/el/aboutTor.dtd +++ b/chrome/locale/el/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Το Tor είναι ελεύθερο λογισμικό, λόγω δωρεών από άτομα σαν κι εσας."> <!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> diff --git a/chrome/locale/el/browserOnboarding.properties b/chrome/locale/el/browserOnboarding.properties index d76aebc3..ba38b8ba 100644 --- a/chrome/locale/el/browserOnboarding.properties +++ b/chrome/locale/el/browserOnboarding.properties @@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Πάμε στο Δίκτυο Tor onboarding.tour-tor-network=Δίκτυο Tor onboarding.tour-tor-network.title=Ας ταξιδέψουμε σε ένα αποκεντρωμένο δίκτυο. onboarding.tour-tor-network.description=Ο Tor Browser σας συνδέει στο δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές από όλο τον κόσμο. Σε αντίθεση με ένα VPN, δεν υπάρχει κανένα σημείο αποτυχίας ή κεντρική οντότητα που πρέπει να εμπιστευτείτε για να απολαύσετε το διαδίκτυο ιδιωτικά. -onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. -onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings +onboarding.tour-tor-network.description-para2=ΝΕΟ: Ρυθμίσεις δικτύου Tor, συμπεριλαμβάνει την δυνατότητα αίτησης γεφύρωσης όπου είναι αποκλεισμένο το Tor, θα τα βρείτε στις Προτιμήσεις. +onboarding.tour-tor-network.action-button=Προσαρμόστε τις ρυθμίσεις δικτύου σας Tor onboarding.tour-tor-network.button=Πάμε στην προεπισκόπηση κυκλώματος onboarding.tour-tor-circuit-display=Προεπισκόπηση κυκλώματος @@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Νέο onboarding.tour-tor-update.prefix-updated=Αναβαθμίστηκε onboarding.tour-tor-toolbar=Γραμμή εργαλείων -onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button. +onboarding.tour-tor-toolbar-update-9.0.title=Αντίο Κουμπί Onion. onboarding.tour-tor-toolbar-update-9.0.description=We want your experience using Tor to be fully integrated within Tor Browser. onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, rather than using the onion button, you can see your Tor Circuit via the [i] in the URL bar and request a New Identity using the toolbar button or the [≡] menu. -onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity +onboarding.tour-tor-toolbar-update-9.0.button=Πως να Αιτηθείτε Νέα Ταυτότητα onboarding.tour-tor-toolbar-update-9.0.next-button=Πηγαίντε στο Δίκτυο Tor # Circuit Display onboarding. diff --git a/chrome/locale/el/torbutton.dtd b/chrome/locale/el/torbutton.dtd index 7da8a97a..4e8dd1c0 100644 --- a/chrome/locale/el/torbutton.dtd +++ b/chrome/locale/el/torbutton.dtd @@ -36,7 +36,7 @@ <!ENTITY torbutton.prefs.sec_js_disabled "Η JavaScript είναι απενεργοποιημένη σε όλους τους ιστότοπους ως προεπιλογή."> <!ENTITY torbutton.prefs.sec_limit_typography "Μερικές γραμματοσειρές και μαθηματικά σύμβολα είναι απενεργοποιημένα."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Ορισμένες γραμματοσειρές, εικονίδια, μαθηματικά σύμβολα και εικόνες είναι απενεργοποιημένα."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Αναπαραγωγή ήχου και βίντεο (πολυμέσα HTML5) και WebGL με ένα κλικ."> <!ENTITY torbutton.prefs.sec_custom_warning "Προσαρμογή "> <!ENTITY torbutton.prefs.sec_overview "Απενεργοποιήστε ορισμένα χαρακτηριστικά του διαδικτύου που μπορεί να χρησιμοποιηθούν για επιθέσεις εναντίον της ασφάλειας και της ανωνυμίας σας."> <!ENTITY torbutton.prefs.sec_standard_tooltip "Επίπεδο ασφαλείας: Βασικό"> @@ -49,5 +49,5 @@ <!ENTITY torbutton.circuit_display.new_circuit "Νέο κύκλωμα για αυτή την ιστοσελίδα">  -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Εκτέλεση εντολής αυθεντικοποίησης client υπηρεσίας onion"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Απομνημόνευση κλειδιού"> diff --git a/chrome/locale/el/torbutton.properties b/chrome/locale/el/torbutton.properties index 72518d1c..828f58b6 100644 --- a/chrome/locale/el/torbutton.properties +++ b/chrome/locale/el/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = Άγνωστη χώρα torbutton.circuit_display.guard = Φύλακας torbutton.circuit_display.guard_note = Ο [Φύλακας] κόμβος σας δεν μπορεί να αλλάξει. torbutton.circuit_display.learn_more = Μάθετε περισσότερα -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = Κλίκ για αντιγραφή +torbutton.circuit_display.copied = Αντιγράφηκε! torbutton.content_sizer.margin_tooltip = Ο Tor Browser προσθέτει αυτό το περιθώριο για να κάνει το πλάτος και το ύψος του παραθύρου σου λιγότερο ξεχωριστό, οπότε μειώνεται η ικανότητα των άλλων να σε παρακολουθούν διαδικτυακά. torbutton.panel.tooltip.disabled = Κάντε κλικ για να ενεργοποιήσετε το Tor torbutton.panel.tooltip.enabled = Κάντε κλικ για να απενεργοποιήσετε το Tor @@ -60,32 +60,32 @@ updateDownloadingPanelUILabel=Λήψη %S ενημερώσεων # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Κρυπτογραφημένη σύνδεση (υπηρεσία Onion, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Κρυπτογραφημένη σύνδεση (υπηρεσία Onion) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Όνομα Onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Μάθετε περισσότερα onionServices.errorPage.browser=Περιηγητής onionServices.errorPage.network=Δίκτυο -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Onion σελίδα # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found +onionServices.descNotFound.pageTitle=Σφάλμα φόρτωσης σελίδας Onion +onionServices.descNotFound.header=Η σελίδα Onion δεν βρέθηκε onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite +onionServices.descInvalid.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.descInvalid.header=Onionsite Cannot Be Reached onionServices.descInvalid=The onionsite is unreachable due an internal error. onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite +onionServices.introFailed.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.introFailed.header=Onionsite Has Disconnected onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite +onionServices.rendezvousFailed.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.rendezvousFailed.header=Unable to Connect to Onionsite onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. @@ -100,18 +100,18 @@ onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite +onionServices.badAddress.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.badAddress.header=Invalid Onionsite Address onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite +onionServices.introTimedOut.pageTitle=Σφάλμα φόρτωσης σελίδας Onion onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Τέλος onionServices.authPrompt.doneAccessKey=d @@ -122,7 +122,7 @@ onionServices.authPreferences.overview=Some onion services require that you iden onionServices.authPreferences.savedKeys=Saved Keys… onionServices.authPreferences.dialogTitle=Onion Service Keys onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionSite=Onion σελίδα onionServices.authPreferences.onionKey=Κλειδί onionServices.authPreferences.remove=Απομάκρυνση onionServices.authPreferences.removeAll=Remove All diff --git a/chrome/locale/es-AR/torbutton.properties b/chrome/locale/es-AR/torbutton.properties index ab1c0be4..ad3c948e 100644 --- a/chrome/locale/es-AR/torbutton.properties +++ b/chrome/locale/es-AR/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=No se pudo conectar al sitio Onion, posiblemente deb 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.description=%S está solicitando su clave privada. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Ingrese su clave privada para este servicio Onion onionServices.authPrompt.done=Hecho onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/es-ES/torbutton.properties b/chrome/locale/es-ES/torbutton.properties index aada4fc7..93ffe04c 100644 --- a/chrome/locale/es-ES/torbutton.properties +++ b/chrome/locale/es-ES/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=No te has conectado a onionsite, quizá por una mala onionServices.introTimedOut.longDescription=Detalles: %S - Se ha agotado la conexión solicitada con el servicio de onion, mientras se intentaba construir el circuito de encuentro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S está solicitando tu clave privada. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Introduce tu clave privada para este servicio cebolla onionServices.authPrompt.done=Listo onionServices.authPrompt.doneAccessKey=r diff --git a/chrome/locale/eu/torbutton.properties b/chrome/locale/eu/torbutton.properties index 1c95aeff..fd06b66e 100644 --- a/chrome/locale/eu/torbutton.properties +++ b/chrome/locale/eu/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Eginda onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 02668325..065da9af 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=اتصال به سایت پیازی، احتمالا onionServices.introTimedOut.longDescription=جزئیات: S% — وقت اتصال به سرویس پیازی درخواست شده اتمام یافت در حالی که سعی داشت تا چرخه ملاقات را ایجاد کند. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S درخواست کلید خصوصی شما را دارد. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=کلید خصوصی خود برای این سرویس Onion را، وارد کنید. onionServices.authPrompt.done=انجام شد onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/fr/torbutton.properties b/chrome/locale/fr/torbutton.properties index 33327e63..01226a9c 100644 --- a/chrome/locale/fr/torbutton.properties +++ b/chrome/locale/fr/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Échec de connexion au site onion, possiblement en r onionServices.introTimedOut.longDescription=Détails : %S – La connexion au service onion demandé est arrivée au bout de son délai en essayant de construire le circuit de rencontre. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S demande votre clé privée. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Saisissez votre clé privée pour ce service onion onionServices.authPrompt.done=Terminé onionServices.authPrompt.doneAccessKey=t diff --git a/chrome/locale/ga-IE/torbutton.properties b/chrome/locale/ga-IE/torbutton.properties index 9a7b9822..aa201bee 100644 --- a/chrome/locale/ga-IE/torbutton.properties +++ b/chrome/locale/ga-IE/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Déanta onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/he/torbutton.properties b/chrome/locale/he/torbutton.properties index b3ac76ab..c3fd7b52 100644 --- a/chrome/locale/he/torbutton.properties +++ b/chrome/locale/he/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=חיבור אל אתר הבצל נכשל, כנראה onionServices.introTimedOut.longDescription=פרטים: %S — החיבור אל שירות הבצל המבוקש לקח פסק זמן בעת ניסיון לבנות את מעגל המפגש. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S מבקש את המפתח הפרטי שלך. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=הכנס את המפתח הפרטי שלך עבור שירות בצל זה onionServices.authPrompt.done=סיים onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/hu/torbutton.properties b/chrome/locale/hu/torbutton.properties index 79572816..12348fe5 100644 --- a/chrome/locale/hu/torbutton.properties +++ b/chrome/locale/hu/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Sikertelen a csatlakozás az onionsite-hoz, feltehet onionServices.introTimedOut.longDescription=Részletek: %S — A kapcsolat a kért opnion szolgáltatás felé időtúllépésre futott, miközben randevúzni próbált az áramkörrel. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S kéri a privát kulcsát. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Adja meg privát kulcsát ehhez az onion szolgáltatáshoz onionServices.authPrompt.done=Kész onionServices.authPrompt.doneAccessKey=a diff --git a/chrome/locale/id/torbutton.properties b/chrome/locale/id/torbutton.properties index 9acf6b7c..49fae587 100644 --- a/chrome/locale/id/torbutton.properties +++ b/chrome/locale/id/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Selesai onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties index 1b67d3d8..17a37356 100644 --- a/chrome/locale/is/torbutton.properties +++ b/chrome/locale/is/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S er að biðja um einkalykilinn þinn. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Settu inn einkalykilinn þinn fyrir þessa onion-þjónustu onionServices.authPrompt.done=Lokið onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/it/torbutton.properties b/chrome/locale/it/torbutton.properties index 3096214a..fe6b6b78 100644 --- a/chrome/locale/it/torbutton.properties +++ b/chrome/locale/it/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Connessione al sito onion fallita, probabilmente per onionServices.introTimedOut.longDescription=Dettagli: %S — La connessione al servizio onion richiesto è scaduta mentre si tentava di costruire il circuito di incontro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S richiede la tua chiave privata. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Inserisci la tua chiave privata per questo servizio onion onionServices.authPrompt.done=Fatto onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/ja/aboutTor.dtd b/chrome/locale/ja/aboutTor.dtd index 5babf0e7..10eb73a1 100644 --- a/chrome/locale/ja/aboutTor.dtd +++ b/chrome/locale/ja/aboutTor.dtd @@ -8,10 +8,10 @@ <!ENTITY aboutTor.viewChangelog.label "変更履歴を表示"> -<!ENTITY aboutTor.ready.label "探索する。プライベートに。"> -<!ENTITY aboutTor.ready2.label "世界で最もプライベートなブラウジングを体験する準備が整いました。"> +<!ENTITY aboutTor.ready.label "プライベートなブラウジングを開始"> +<!ENTITY aboutTor.ready2.label "世界で最もプライベートなブラウジングを行うための準備が完了しました。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> -<!ENTITY aboutTor.failure2.label "Tor は、このブラウザでは動作しません。"> +<!ENTITY aboutTor.failure2.label "Tor は、現在このブラウザで動作していません。"> <!ENTITY aboutTor.search.label "DuckDuckGo で検索"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Tor からの最新ニュースを受信トレイに。"> <!ENTITY aboutTor.newsletter.link_text "Tor ニュースに申し込む。"> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor は皆さんからの寄付に支えられています。"> <!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> diff --git a/chrome/locale/ja/torbutton.dtd b/chrome/locale/ja/torbutton.dtd index b554c344..ade81f24 100644 --- a/chrome/locale/ja/torbutton.dtd +++ b/chrome/locale/ja/torbutton.dtd @@ -46,8 +46,8 @@ <!ENTITY torbutton.prefs.sec_restore_defaults "デフォルトにもどす"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "詳細セキュリティ設定…"> <!ENTITY torbutton.circuit_display.title "Tor サーキット"> -<!ENTITY torbutton.circuit_display.new_circuit "このサイトに新しいサーキットを使う"> +<!ENTITY torbutton.circuit_display.new_circuit "このサイト用のサーキットを再構築">  <!ENTITY torbutton.onionServices.authPrompt.tooltip "オニオンサービスのクライアント認証プロンプトを開く"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "このキーを忘れないで、覚えておいてください。"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "この鍵を忘れないで、覚えておいてください。"> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index e0bf1baa..5ebc1dbd 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -8,8 +8,8 @@ torbutton.circuit_display.unknown_country = 不明な国 torbutton.circuit_display.guard = ガード torbutton.circuit_display.guard_note = [ガード] ノードは変更されない場合があります。 torbutton.circuit_display.learn_more = 詳細情報 -torbutton.circuit_display.click_to_copy = Click to Copy -torbutton.circuit_display.copied = Copied! +torbutton.circuit_display.click_to_copy = クリックしてコピー +torbutton.circuit_display.copied = コピーされました torbutton.content_sizer.margin_tooltip = Tor Browser はウィンドウのサイズを平凡にするためにこのマージンを追加します。これにより、あなたのことをオンラインで追跡しにくくします。 torbutton.panel.tooltip.disabled = クリックしてTorを有効にする torbutton.panel.tooltip.enabled = クリックしてTorを無効にする @@ -60,85 +60,85 @@ updateDownloadingPanelUILabel=%S 更新をダウンロードしています # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています (Onion サービス、%1$S、鍵長 %2$S bit、%3$S) pageInfo_OnionEncryption=接続が暗号化されています (Onion サービス) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Onion 名: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=詳細情報 onionServices.errorPage.browser=ブラウザ onionServices.errorPage.network=ネットワーク -onionServices.errorPage.onionSite=Onionsite +onionServices.errorPage.onionSite=Onion サイト # LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with # an error code, e.g., 0xF3. # Tor SOCKS error 0xF0: -onionServices.descNotFound.pageTitle=Problem Loading Onionsite -onionServices.descNotFound.header=Onionsite Not Found -onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.descNotFound.pageTitle=Onion サイトの読み込み中に問題が発生しました +onionServices.descNotFound.header=Onion サイトが見つかりません +onionServices.descNotFound=おそらく、Onion サイトがオフラインになっています。Onion サイトの管理者にお問い合わせください。 onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. # Tor SOCKS error 0xF1: -onionServices.descInvalid.pageTitle=Problem Loading Onionsite -onionServices.descInvalid.header=Onionsite Cannot Be Reached -onionServices.descInvalid=The onionsite is unreachable due an internal error. +onionServices.descInvalid.pageTitle=Onion サイトの読み込み中に問題が発生しました +onionServices.descInvalid.header=Onion サイトに到達できません +onionServices.descInvalid=内部エラーにより Onion サイトに到達できません。 onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. # Tor SOCKS error 0xF2: -onionServices.introFailed.pageTitle=Problem Loading Onionsite -onionServices.introFailed.header=Onionsite Has Disconnected -onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator. +onionServices.introFailed.pageTitle=Onion サイトの読み込み中に問題が発生しました +onionServices.introFailed.header=Onion サイトとの接続が切断されました +onionServices.introFailed=おそらく、Onion サイトがオフラインになっています。Onion サイトの管理者にお問い合わせください。 onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. # Tor SOCKS error 0xF3: -onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite -onionServices.rendezvousFailed.header=Unable to Connect to Onionsite -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. +onionServices.rendezvousFailed.pageTitle=Onion サイトの読み込み中に問題が発生しました +onionServices.rendezvousFailed.header=Onion サイトに接続できません +onionServices.rendezvousFailed=Onion サイトがビジー状態であるか、または Tor ネットワークに大きな負荷がかかっています。時間をおいて再度やり直してください。 onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. # Tor SOCKS error 0xF4: -onionServices.clientAuthMissing.pageTitle=Authorization Required -onionServices.clientAuthMissing.header=Onionsite Requires Authentication -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. +onionServices.clientAuthMissing.pageTitle=認証が必要です +onionServices.clientAuthMissing.header=Onion サイトは認証を必要としています +onionServices.clientAuthMissing=Onion サイトへのアクセスに鍵が必要ですが、何も入力されませんでした。 onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. # Tor SOCKS error 0xF5: -onionServices.clientAuthIncorrect.pageTitle=Authorization Failed -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. +onionServices.clientAuthIncorrect.pageTitle=認証に失敗しました +onionServices.clientAuthIncorrect.header=Onion サイトの認証に失敗しました +onionServices.clientAuthIncorrect=入力された鍵が正しくないか、または鍵が取り消されました。Onion サイトの管理者にお問い合わせください。 onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. # Tor SOCKS error 0xF6: -onionServices.badAddress.pageTitle=Problem Loading Onionsite -onionServices.badAddress.header=Invalid Onionsite Address -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. +onionServices.badAddress.pageTitle=Onion サイトの読み込み中に問題が発生しました +onionServices.badAddress.header=無効な Onion サイトアドレスです +onionServices.badAddress=入力された Onion サイトアドレスは有効ではありません。アドレスが正しく入力されているかをご確認ください。 onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. # Tor SOCKS error 0xF7: -onionServices.introTimedOut.pageTitle=Problem Loading Onionsite -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. +onionServices.introTimedOut.pageTitle=Onion サイトの読み込み中に問題が発生しました +onionServices.introTimedOut.header=Onion サイトのサーキット作成がタイムアウトしました +onionServices.introTimedOut=ネットワークの接続状態が不安定だったため、Onion サイトへの接続に失敗しました。 onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%Sは秘密鍵を要求しています。 -onionServices.authPrompt.keyPlaceholder=このオニオンサービスのあなたの秘密鍵を入力してください +onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.keyPlaceholder=この Onion サービスのあなたの秘密鍵を入力してください onionServices.authPrompt.done=完了 onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=有効なキーを入力してください（52 Base32文字または44 Base64文字） onionServices.authPrompt.failedToSetKey=あなたのキーでTorを構成できませんでした -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.header=Onion サービス認証 +onionServices.authPreferences.overview=一部の Onion サービスでは、アクセスする前に鍵(パスワードの様なもの)で自分自身を識別する必要があります。 +onionServices.authPreferences.savedKeys=保存されている鍵… +onionServices.authPreferences.dialogTitle=Onion サービス鍵 +onionServices.authPreferences.dialogIntro=以下の Onion サイトの鍵が、あなたのコンピュータに保存されています +onionServices.authPreferences.onionSite=Onion サイト onionServices.authPreferences.onionKey=鍵 onionServices.authPreferences.remove=解除 -onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.removeAll=すべて削除 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor onionServices.authPreferences.failedToRemoveKey=Unable to remove key # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=常に Onion を優先する onionLocation.alwaysPrioritizeAccessKey=a onionLocation.notNow=今は許可しない onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… +onionLocation.description=このサイトは、現在よりもプライベートで安全なバージョンが利用可能です。これは、Onion サービスを介して Tor ネットワーク上で利用できます。Onion サービスは、監視および検閲を無効化し、ウェブサイトの公開者および閲覧者を保護する上で役立ちます。 +onionLocation.tryThis=Onion サービスを試す +onionLocation.onionAvailable=.onion 利用可能 +onionLocation.learnMore=詳細情報 onionLocation.always=常に -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.askEverytime=毎回尋ねる +onionLocation.prioritizeOnionsDescription=存在する場合は .onion サイトを優先的に利用する。 onionLocation.onionServicesTitle=Onion サービス diff --git a/chrome/locale/ka/torbutton.properties b/chrome/locale/ka/torbutton.properties index 26323e15..5714996f 100644 --- a/chrome/locale/ka/torbutton.properties +++ b/chrome/locale/ka/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=ჩამოიტვირთება %S გა # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=კავშირი დაშიფრულია (Onion-მომსახურება, %1$S, %2$S ბიტიანი გასაღებები, %3$S) pageInfo_OnionEncryption=კავშირი დაშიფრულია (Onion-მომსახურება) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Onion-სახელი: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=იხილეთ ვრცლად @@ -111,7 +111,7 @@ onionServices.introTimedOut=ვერ მოხერხდა onion-საი onionServices.introTimedOut.longDescription=ვრცლად: %S — მოთხოვნილ onion-მომსახურებასთან კავშირის ვადა ამოიწურა, შეხვედრის წრედის ჩამოყალიბებისას. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S ითხოვს თქვენს საიდუმლო გასაღებს. +onionServices.authPrompt.description2=%S ითხოვს ანგარიშის დამოწმებას. onionServices.authPrompt.keyPlaceholder=შეიყვანეთ თქვენი საიდუმლო გასაღები ამ onion-მომსახურებისთვის onionServices.authPrompt.done=მზადაა onionServices.authPrompt.doneAccessKey=დ diff --git a/chrome/locale/ko/aboutTor.dtd b/chrome/locale/ko/aboutTor.dtd index 37f4e154..04e6de97 100644 --- a/chrome/locale/ko/aboutTor.dtd +++ b/chrome/locale/ko/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor는 바로 당신과 같은 사람들의 기부 덕분에 자유롭게 사용할 수 있습니다."> <!ENTITY aboutTor.donationBanner.buttonA "기부하기"> diff --git a/chrome/locale/ko/torbutton.properties b/chrome/locale/ko/torbutton.properties index 4cb39034..51ceec0a 100644 --- a/chrome/locale/ko/torbutton.properties +++ b/chrome/locale/ko/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S 에서 당신의 개인키를 요구하고 있습니다. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=이 onion 서비스를 사용하기 위해 개인키를 입력하세요. onionServices.authPrompt.done=완성 onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/lt/torbutton.properties b/chrome/locale/lt/torbutton.properties index 60e04704..4d012386 100644 --- a/chrome/locale/lt/torbutton.properties +++ b/chrome/locale/lt/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Nepavyko prisijungti prie onion svetainės, galbūt onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S prašo jūsų asmeninio rakto. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Įveskite savo privatųjį, šiai onion paslaugai skirtą, raktą onionServices.authPrompt.done=Atlikta onionServices.authPrompt.doneAccessKey=u diff --git a/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties index 52d1dc98..abf97d25 100644 --- a/chrome/locale/mk/torbutton.properties +++ b/chrome/locale/mk/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Неуспешно поврзување на onion onionServices.introTimedOut.longDescription=Детали: %S — Времето за поврзување со бараната onion услуга истече додека се градеше кругот. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S го бара вашиот приватен клуч. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Внесете го вашиот приватен клуч за оваа onion услуга onionServices.authPrompt.done=Завршено onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/ms/torbutton.properties b/chrome/locale/ms/torbutton.properties index e2993528..17e4fd22 100644 --- a/chrome/locale/ms/torbutton.properties +++ b/chrome/locale/ms/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Selesai onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/nb-NO/torbutton.properties b/chrome/locale/nb-NO/torbutton.properties index 9f50f211..1a1cf7eb 100644 --- a/chrome/locale/nb-NO/torbutton.properties +++ b/chrome/locale/nb-NO/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S ber om din private nøkkel. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Ferdig onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/nl/torbutton.properties b/chrome/locale/nl/torbutton.properties index 8036f020..a037f2d0 100644 --- a/chrome/locale/nl/torbutton.properties +++ b/chrome/locale/nl/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Verbinding maken met de onion-website is mislukt, mo onionServices.introTimedOut.longDescription=Details: %S – Time-out bij verbinding met de opgevraagde onion-service tijdens opbouwen van het rendezvous-circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S vraagt om uw privésleutel. +onionServices.authPrompt.description2=%S vraagt om uw authenticatie. onionServices.authPrompt.keyPlaceholder=Voer uw privésleutel voor deze onion-service in onionServices.authPrompt.done=Gereed onionServices.authPrompt.doneAccessKey=G diff --git a/chrome/locale/pl/torbutton.properties b/chrome/locale/pl/torbutton.properties index 8500181e..be3b73ab 100644 --- a/chrome/locale/pl/torbutton.properties +++ b/chrome/locale/pl/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description= %S żąda Twojego klucza prywatnego. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Wprowadź swój klucz prywatny dla tej usługi cebulowej onionServices.authPrompt.done=Skończone onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/pt-BR/torbutton.properties b/chrome/locale/pt-BR/torbutton.properties index ed63bc4d..259cbd00 100644 --- a/chrome/locale/pt-BR/torbutton.properties +++ b/chrome/locale/pt-BR/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Falha ao conectar ao onionsite, possivelmente devido onionServices.introTimedOut.longDescription=Detalhes: %S — O tempo limite da conexão com o serviço de cebola solicitado expirou ao tentar construir o circuito de encontro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S está solicitado a sua chave privada. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Insira a sua chave privada para usar este serviço onion onionServices.authPrompt.done=Pronto onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/ro/torbutton.properties b/chrome/locale/ro/torbutton.properties index facd8c8b..cb9c846f 100644 --- a/chrome/locale/ro/torbutton.properties +++ b/chrome/locale/ro/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Eroare la conectarea la Oniosite, posibil din cauza onionServices.introTimedOut.longDescription=Detalii: %S — Conexiunea la serviciul Onion solicitat a expirat în timp ce încercați să construiți circuitul de întâlnire. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S solicită cheia dvs. privată. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Introduceți cheia privată pentru acest serviciu de ceapă onionServices.authPrompt.done=Gata onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/ru/torbutton.properties b/chrome/locale/ru/torbutton.properties index 4ed30459..950faec4 100644 --- a/chrome/locale/ru/torbutton.properties +++ b/chrome/locale/ru/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S запрашивает ваш закрытый ключ. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Готово onionServices.authPrompt.doneAccessKey=Д diff --git a/chrome/locale/sv-SE/torbutton.properties b/chrome/locale/sv-SE/torbutton.properties index abed60df..9cd38f2b 100644 --- a/chrome/locale/sv-SE/torbutton.properties +++ b/chrome/locale/sv-SE/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Det gick inte att ansluta till onion-webbplats, even onionServices.introTimedOut.longDescription=Detaljer: %S — Anslutningen till den begärda onion-tjänsten avbröts när man försökte bygga möteskretsen. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S begär din privata nyckel. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Ange din privata nyckel för den här onion-tjänsten onionServices.authPrompt.done=Färdig onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/th/torbutton.properties b/chrome/locale/th/torbutton.properties index 50b66318..5ebad60e 100644 --- a/chrome/locale/th/torbutton.properties +++ b/chrome/locale/th/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S ร้องขอกุญแจส่วนตัวของคุณ +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=ใส่กุญแจส่วนตัวของคุณสำหรับ onion service นี้ onionServices.authPrompt.done=เสร็จสิ้น onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/tr/torbutton.properties b/chrome/locale/tr/torbutton.properties index 499e043a..6fa7bdc6 100644 --- a/chrome/locale/tr/torbutton.properties +++ b/chrome/locale/tr/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Onion sitesi ile bağlantı kurulamadı. Büyük ola onionServices.introTimedOut.longDescription=Ayrıntılar: %S — İstenilen onion hizmeti ile görüşme devresi kurulurken işlem zaman aşımına uğradı. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S kişisel anahtarınıza gerek duyuyor +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Bu Onion hizmeti için kişisel anahtarınızı yazın onionServices.authPrompt.done=Tamam onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/vi/torbutton.properties b/chrome/locale/vi/torbutton.properties index ca81bcbe..7cd3c34c 100644 --- a/chrome/locale/vi/torbutton.properties +++ b/chrome/locale/vi/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Hoàn tất onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/zh-CN/torbutton.properties b/chrome/locale/zh-CN/torbutton.properties index 45384ca7..4fdb1b88 100644 --- a/chrome/locale/zh-CN/torbutton.properties +++ b/chrome/locale/zh-CN/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=洋葱站点连接失败，可能是由于网络连 onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S 需要您的私钥 +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=输入您的私钥来使用此洋葱服务 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=天 diff --git a/chrome/locale/zh-TW/torbutton.properties b/chrome/locale/zh-TW/torbutton.properties index 2c31f7bf..1d2c6613 100644 --- a/chrome/locale/zh-TW/torbutton.properties +++ b/chrome/locale/zh-TW/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description=%S 正請求您的私鑰。 +onionServices.authPrompt.description2=%S is requesting that you authenticate. onionServices.authPrompt.keyPlaceholder=請輸入私鑰以使用此 onion 服務 onionServices.authPrompt.done=完成 onionServices.authPrompt.doneAccessKey=d

1 0

[tor-browser-build/maint-9.5] Release preparations for 9.5.1
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit 4deaf6277e46684021af8e250666f5cf815a773d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 19:19:01 2020 +0000 Release preparations for 9.5.1 Changelog update and versions bump --- projects/firefox/config | 4 ++-- projects/tba-translation/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 6 +++--- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 012f82a..b5d3d08 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.9.0 + firefox_platform_version: 68.10.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/tba-translation/config b/projects/tba-translation/config index ab5c04e..520f570 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd +git_hash: e93401f698cca39971395625e1f8de54b978ab88 version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 3439afa..a893105 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,15 @@ +Tor Browser 9.5.1 -- June 30 2020 + * All Platforms + * Update Firefox to 68.10.0esr + * Update NoScript to 11.0.31 + * Windows + OS X + Linux + * Bug 34361: "Prioritize .onion sites when known" appears under General + * Bug 34362: Improve Onion Service Authentication prompt + * Bug 34369: Fix learn more link in Onion Auth prompt + * Bug 34379: Fix learn more for Onion-Location + * Android + * Translations update + Tor Browser 9.5 -- June 2 2020 * All Platforms * Update Firefox to 68.9.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3f41ed2..697f737 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: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8 + sha256sum: 16691879de18566c01d5ae9fcdfde183ab645ee6580cae2ee5a37770deac375f - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 77d8e56..3e8689b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5' - torbrowser_build: 'build2' + torbrowser_version: '9.5.1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.10 + - 9.5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.9.0esr-9.5-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 23 Jun '20

23 Jun '20

commit c48e4ca617fbeb0e6b0e5b7c44b601dfbe2a9531 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 23 14:40:28 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 0b6562dfffd0..605e9d398ab0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 0b6562dfffd0e032ea0051a8c09069fba37d4838 +Subproject commit 605e9d398ab026ce53ec8ad106848bfe5ae5e627

1 0

[tor-browser-build/master] Bug 32895: Improve MAR-signing check script
by sysrqb＠torproject.org 22 Jun '20

22 Jun '20

commit a3c272d2e53ea60c1a596bc25189e6f63a535471 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 23 20:37:55 2020 +0000 Bug 32895: Improve MAR-signing check script We improve the script in the following ways: 1) Properly check the signature of the MAR files 2) Take #20254 into account 3) Fix all issues `shellcheck` found --- tools/marsigning_check.sh | 127 +++++++++++++++++++++++++++++++++------------- 1 file changed, 91 insertions(+), 36 deletions(-) diff --git a/tools/marsigning_check.sh b/tools/marsigning_check.sh index 3e58249..fb5e4f6 100755 --- a/tools/marsigning_check.sh +++ b/tools/marsigning_check.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (c) 2019, The Tor Project, Inc. +# Copyright (c) 2020, The Tor Project, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -33,9 +33,20 @@ # Usage: # 1) Let SIGNMAR point to your signmar binary # 2) Let LD_LIBRARY_PATH point to the mar-tools directory -# 3) Change into the directory containing the MAR files and the +# 3) Let NSS_DB_DIR point to the directory containing the database with the +# signing certificate to check against. +# +# To create the database to use for signature checking import the +# release*.der certificate of your choice found in +# toolkit/mozapps/update/updater by issuing the following commands: +# +# mkdir nssdb +# certutil -d nssdb -N --empty-password +# certutil -A -n "marsigner" -t,, -d nssdb -i /path/to/.der +# +# 4) Change into the directory containing the MAR files and the # sha256sums-unsigned-build.txt/sha256sums-unsigned-build.incrementals.txt. -# 4) Run /path/to/marsigning_check.sh +# 5) Run /path/to/marsigning_check.sh if [ -z "$SIGNMAR" ] then @@ -49,60 +60,104 @@ then exit 1 fi -UNSIGNED_MARS=0 -BADSIGNED_MARS=0 +if [ -z "$NSS_DB_DIR" ] +then + echo "The path to your nssdb directory is missing!" + exit 1 +fi + +unsigned_mars=0 +badsigned_mars=0 +not_reproduced_mars=0 +# XXX: Stripping the signature of signed macOS MAR files is currently not +# expected to be reproducible, see: #20254. +not_reproduced_mars_expected=0 mkdir tmp -for f in `ls *.mar`; do +for f in *.mar; do case $f in - *.incremental.mar) SHA256_TXT=`grep "$f" \ - sha256sums-unsigned-build.incrementals.txt`;; - *) SHA256_TXT=`grep "$f" sha256sums-unsigned-build.txt`;; + *.incremental.mar) sha256_txt=$(grep "$f" \ + sha256sums-unsigned-build.incrementals.txt);; + *) sha256_txt=$(grep "$f" sha256sums-unsigned-build.txt);; esac - # Test 1: Is the .mar file still unsigned? I.e. does its SHA-256 sum still - # match the one we had before we signed it? If so, notify us later and exit. - if [ "$SHA256_TXT" = "`sha256sum $f`" ] + # Test 1: Is the MAR file correctly signed? + echo "Verifying the MAR signature of $f..." + if ! $SIGNMAR -d "$NSS_DB_DIR" -n marsigner -v "$f" then - echo "$f has still the SHA-256 sum of the unsigned MAR file!" - UNSIGNED_MARS=`expr $UNSIGNED_MARS + 1` + # Something went wrong. Let's figure out what. + if [ "$sha256_txt" = "$(sha256sum "$f")" ] + then + echo "$f has still the SHA-256 sum of the unsigned MAR file!" + unsigned_mars=$((unsigned_mars + 1)) + else + echo "$f is either signed with the wrong key or the signature is" \ + "corrupted!" + badsigned_mars=$((badsigned_mars +1)) + fi fi - # Test 2: Do we get the old SHA-256 sum after stripping the MAR signature? If - # not, notify us later and exit. - if [ "$UNSIGNED_MARS" = "0" ] + # Test 2: Do we get the old SHA-256 sum after stripping the MAR signature? We + # want to have a test for that to be sure we've the signed MAR files in front + # of us which we actually want to ship to our users. + if [ "$unsigned_mars" = "0" ] && [ "$badsigned_mars" = "0" ] then - # At least we seem to have attempted to sign the MAR file. Let's see if we - # succeeded by stripping the signature. This behavior is reproducible. - # Thus, we know if we don't get the same SHA-256 sum we did not sign the - # bundle correctly. - echo "Trying to strip the MAR signature of $f..." - ${SIGNMAR} -r $f tmp/$f - cd tmp - if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] + # At least we seem to have succeeded in signing the MAR file. Let's see if + # it is the expected one. + echo "Checking the SHA-256 sum of the stripped $f..." + ${SIGNMAR} -r "$f" tmp/"$f" + cd tmp || exit 1 + if ! [ "$sha256_txt" = "$(sha256sum "$f")" ] then - echo "$f does not have the SHA-256 sum of the unsigned MAR file!" - BADSIGNED_MARS=`expr $BADSIGNED_MARS + 1` + not_reproduced_mars=$((not_reproduced_mars + 1)) + case "$f" in + *osx64*) + not_reproduced_mars_expected=$((not_reproduced_mars_expected + 1)) + ;; + *) echo "$f does not have the SHA-256 sum of the unsigned MAR file!" + ;; + esac fi - rm $f + rm "$f" cd .. fi + echo "" done rm -rf tmp/ -if ! [ "$UNSIGNED_MARS" = "0" ] +if ! [ "$unsigned_mars" = "0" ] || ! [ "$badsigned_mars" = "0" ] then - echo "We got $UNSIGNED_MARS unsigned MAR file(s), exiting..." + echo "We got:" + if ! [ "$unsigned_mars" = "0" ] + then + echo "$unsigned_mars unsigned MAR file(s)" + fi + if ! [ "$badsigned_mars" = "0" ] + then + echo "$badsigned_mars badly signed MAR file(s)" + fi + echo "exiting..." exit 1 fi -if ! [ "$BADSIGNED_MARS" = "0" ] +if ! [ "$not_reproduced_mars" = "0" ] then - echo "We got $BADSIGNED_MARS badly signed MAR file(s), exiting..." - exit 1 + echo "We got $not_reproduced_mars non-matching, signed MAR files." + if [ "$not_reproduced_mars" -eq "$not_reproduced_mars_expected" ] + then + echo "This is currently expected as we got the same amount of" \ + "non-matching macOS MAR files." + echo "The signatures and non-macOS MAR files are fine." + exit 0 + else + echo "This is currently unexpected as we only got" \ + "$not_reproduced_mars_expected non-matching macOS MAR files," \ + "exiting..." + exit 1 + fi +else + echo "The signatures and MAR files are fine." + exit 0 fi - -echo "The signatures are fine." -exit 0

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_32895_v4'
by sysrqb＠torproject.org 22 Jun '20

22 Jun '20

commit b74754a3fb0af3c9b015a3113aba1d9f8671fa32 Merge: a6e6caf a3c272d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jun 20 17:14:56 2020 +0000 Merge remote-tracking branch 'gktpo/bug_32895_v4' tools/marsigning_check.sh | 127 +++++++++++++++++++++++++++++++++------------- 1 file changed, 91 insertions(+), 36 deletions(-)

1 0

[tor-browser-build/master] Bug 40001: Don't bundle geckodriver in debug builds
by sysrqb＠torproject.org 22 Jun '20

22 Jun '20

commit a6e6caf5f11b578d7a177c519ca0d2bbb9a154dd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 18 08:11:13 2020 +0000 Bug 40001: Don't bundle geckodriver in debug builds --- projects/firefox/build | 18 +++++++++++------- projects/tor-browser/build | 4 +++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index cd0d6b5..16984f3 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -160,7 +160,7 @@ rm -f js/src/configure [% END %] [% IF c("var/linux") %] - [% IF c("var/linux-x86_64") %] + [% IF c("var/linux-x86_64") && !c("var/asan") %] cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir [% END %] cp -a obj-*/dist/firefox/* $distdir/Browser/ @@ -225,8 +225,10 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/ cd $distdir [% IF c("var/linux-x86_64") %] - # No need for an unstripped geckodriver - strip geckodriver + [% IF !c("var/asan") %] + # No need for an unstripped geckodriver + strip geckodriver + [% END %] mkdir -p $distdir/Debug/Browser/gtk2 # Strip and generate debuginfo for the firefox binary that we keep, all *.so # files, the plugin-container, and the updater (see ticket #10126) @@ -272,10 +274,12 @@ END; tar_src => [ 'Debug' ], tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz', }) %] -[% c('tar', { - tar_src => [ 'geckodriver' ], - tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz', - }) %] + [% IF !c("var/asan") %] + [% c('tar', { + tar_src => [ 'geckodriver' ], + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz', + }) %] + [% END %] [% END %] [% c('zip', { diff --git a/projects/tor-browser/build b/projects/tor-browser/build index b9732e8..386ea26 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -293,7 +293,9 @@ SCRIPT_EOF cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% IF c("var/linux-x86_64") -%] cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz - cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/ + [% IF !c("var/asan") -%] + cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/ + [% END -%] [% END -%] [% IF c("var/linux") -%] cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz

1 0

[tor-browser-bundle-testsuite/master] Small fix in install instructions
by gk＠torproject.org 22 Jun '20

22 Jun '20

commit 674d327f80d2281f015d0e81dcd13ba8a782a19f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 22 14:28:59 2020 +0000 Small fix in install instructions --- doc/install.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/install.txt b/doc/install.txt index 8a47992..f42db00 100644 --- a/doc/install.txt +++ b/doc/install.txt @@ -9,7 +9,7 @@ virtualenv, and xvfb or the Xorg dummy driver. Those dependencies can be installed by running the 'install-deps' script as root, which will install the needed packages. This script has been -tested on Ubuntu, Debian, Fedora, Centos. +tested on Ubuntu, Debian, Fedora, and Centos. After installing the required dependencies, a python virtualenv needs to be created with marionette. This can be with the 'setup-virtualenv'

1 0

[rbm/master] Fix typos
by gk＠torproject.org 22 Jun '20

22 Jun '20

commit b9fb4a336ec3c81b4dad216b7c6cfca314ec1c72 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 22 14:24:30 2020 +0000 Fix typos --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e3ab848..c5cc595 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ rbm: Reproducible Build Manager =============================== -rbm is a packaging tool that help you create and build packages for -multiple linux distributions, and automate the parts that can be +rbm is a packaging tool that helps you create and build packages for +multiple Linux distributions, and automate the parts that can be automated. It includes options to run the build in a defined environement to allow reproducing the build.

1 0

[tor-browser-spec/master] We don't have a beta series anymore
by gk＠torproject.org 22 Jun '20

22 Jun '20

commit 38e3ceaeeaa2de5e140d7fd6dcddf33ad0b7365a Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 22 14:21:16 2020 +0000 We don't have a beta series anymore --- processes/VersionNumbers | 5 ----- 1 file changed, 5 deletions(-) diff --git a/processes/VersionNumbers b/processes/VersionNumbers index 80b32a5..210db16 100644 --- a/processes/VersionNumbers +++ b/processes/VersionNumbers @@ -6,11 +6,6 @@ An alpha version is a series of dot separated numbers, followed by an 4.0a1 4.0a2 -A beta version is a series of dot separated numbers, followed by a -'b' and an other number. Examples: - 4.0b1 - 4.0b2 - A stable version is a series of dot separated numbers. Examples: 3.6.6 4.0

1 0