- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 28470: Add fetch gradle dependency script to common project
by gk＠torproject.org 16 Nov '18

16 Nov '18

commit 873289e271fb88c47e1c5738b66a37b723e74ee2 Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 11:12:30 2018 +0000 Bug 28470: Add fetch gradle dependency script to common project The script got written by boklm. --- projects/common/fetch-gradle-dependencies | 19 ++++++++++++++ .../how-to-create-gradle-dependencies-list.txt | 30 ++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/projects/common/fetch-gradle-dependencies b/projects/common/fetch-gradle-dependencies new file mode 100644 index 0000000..0acd38a --- /dev/null +++ b/projects/common/fetch-gradle-dependencies @@ -0,0 +1,19 @@ +#!/bin/bash +set -e +# Bug 28117: setting LC_ALL=C is causing wget to fail downloading some URLs +unset LC_ALL +cd "[% dest_dir %]" +m2dir="$(mktemp -d)" +[% USE artifacts = datafile(c('basedir') _ '/projects/' _ project _ '/gradle-dependencies-list.txt', delim = '|') %] +[% FOREACH artifact = artifacts %] + artifact_path=$(echo "[% artifact.url %]" | sed 's|^https://[^/]\+/||') + artifact_filename=$(basename "$artifact_path") + artifact_dirname=$(dirname "$artifact_path") + [% GET c("urlget", { filename => 'downloaded_file', URL => artifact.url}); %] + echo "[% artifact.sha256sum %] downloaded_file" | sha256sum -c + mkdir -p "$m2dir/$artifact_dirname" + mv -f downloaded_file "$m2dir/$artifact_dirname/$artifact_filename" +[% END -%] +echo "Finished downloading gradle dependencies" +mkdir -p "[% dest_dir %]" +mv -f "$m2dir" "[% dest_dir %]/gradle-dependencies-[% c("var/gradle_dependencies_version") %]" diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt new file mode 100644 index 0000000..ef816d0 --- /dev/null +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -0,0 +1,30 @@ +### Updating Gradle Dependencies +If additional Android dependencies are required by the project's build, then +the Gradle build will fail due to missing dependencies. To find out what the +missing dependencies are, comment out the following line in the project's build +file: + + export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" + +and rerun the build. + +Dependent artifacts will show up as downloads in the logs. You can pull out +these dependencies into a list with the following command (replacing +"firefox-android-armv7.log" with the build log file name of the actual project): + +`cat logs/firefox-android-armv7.log | grep "Download http" | sed "s/^.*Download //g" > download-urls.txt` + +You will then need to add the new dependency URLs and SHA-256 values into the +projects/$project/gradle-dependencies-list.txt file. The format of this file is +pipe delimited + sha256sum | url + +Finally, in the project's config file increment the +var/gradle_dependencies_version and make sure to restore the project's build +file back to original. + +It may also be the case that you wish to clean up old versions of the artifacts. +For this you will need to run the build with a +gradle-dependencies-list.txt file containing only the headers. Make sure to also +comment the GRADLE_MAVEN_REPOSITORIES line from the project's build file. You +can now proceed to reconstruct the list as given above.

1 0

[tor-browser-build/master] Bug 28469: Fix unsupported libbacktrace in Rust 1.26
by gk＠torproject.org 16 Nov '18

16 Nov '18

commit d4215cdbc472573bafe020532ebfcfb491e7615f Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 07:19:03 2018 +0000 Bug 28469: Fix unsupported libbacktrace in Rust 1.26 --- ...e-dl_iterate_phdr-is-undefined-on-Android.patch | 34 +++++++++++++++++ projects/rust/build | 5 +++ projects/rust/config | 6 ++- projects/rust/replace_pagesize_in_mmap.patch | 44 ++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) diff --git a/projects/rust/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch b/projects/rust/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch new file mode 100644 index 0000000..75cd657 --- /dev/null +++ b/projects/rust/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch @@ -0,0 +1,34 @@ +From 4fa67c8a014ac10558be71edec9048851ca7a02d Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 15 Nov 2018 19:04:46 +0000 +Subject: [PATCH] Make sure `dl_iterate_phdr` is undefined on Android + +If we build with API < 21 we'll run into undefined reference errors. +We follow the Rust people who ran into similar issues when +upgrading libbacktrace for 1.28.0 in making sure `dl_iterate_phdr` is +not defined for Android. + +diff --git a/src/libbacktrace/configure b/src/libbacktrace/configure +index 8bdb29d256..8941fcd2b0 100755 +--- a/src/libbacktrace/configure ++++ b/src/libbacktrace/configure +@@ -12397,7 +12397,15 @@ rm -f conftest* + have_dl_iterate_phdr=no ;; + esac + else +- ac_fn_c_check_func "$LINENO" "dl_iterate_phdr" "ac_cv_func_dl_iterate_phdr" ++ case "${host}" in ++ *-*-androideabi*) ++ # Avoid dl_iterate_phdr on older Android API (which we use), ++ # as defining it causes undefined reference errors when ++ # compiling Firefox later on. ++ have_dl_iterate_phdr=no ;; ++ *) ac_fn_c_check_func "$LINENO" "dl_iterate_phdr" "ac_cv_func_dl_iterate_phdr" ;; ++ esac ++ + if test "x$ac_cv_func_dl_iterate_phdr" = x""yes; then : + have_dl_iterate_phdr=yes + else +-- +2.19.1 + diff --git a/projects/rust/build b/projects/rust/build index 7ae3073..12f012a 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -62,6 +62,11 @@ cd /var/tmp/build/rustc-[% c('version') %]-src patch -p1 < $rootdir/unwind.patch [% END %] +[% IF c("var/android") %] + patch -p1 < $rootdir/0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + patch -p1 < $rootdir/replace_pagesize_in_mmap.patch +[% END %] + mkdir build cd build ../configure --prefix=$distdir [% c("var/configure_opt") %] diff --git a/projects/rust/config b/projects/rust/config index 83ae690..99d1177 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -22,7 +22,7 @@ targets: - libssl-dev - pkg-config - zlib1g-dev - configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.ar=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-ar --set=target.armv7-linux-androideabi.linker=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-clang --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc + configure_opt: --enable-local-rust --enable-vendor --enable-extended --release-channel=stable --sysconfdir=etc --target=armv7-linux-androideabi --set=target.armv7-linux-androideabi.cc=$ANDROID_NDK_HOME/arm/bin/arm-linux-androideabi-gcc linux: var: @@ -90,3 +90,7 @@ input_files: gpg_keyring: rust.gpg - filename: unwind.patch enable: '[% c("var/windows-i686") %]' + - filename: 0001-Make-sure-dl_iterate_phdr-is-undefined-on-Android.patch + enable: '[% c("var/android") %]' + - filename: replace_pagesize_in_mmap.patch + enable: '[% c("var/android") %]' diff --git a/projects/rust/replace_pagesize_in_mmap.patch b/projects/rust/replace_pagesize_in_mmap.patch new file mode 100644 index 0000000..598f190 --- /dev/null +++ b/projects/rust/replace_pagesize_in_mmap.patch @@ -0,0 +1,44 @@ +diff --git a/src/libbacktrace/mmap.c b/src/libbacktrace/mmap.c +index 138ef70711..e3c4cd2643 100644 +--- a/src/libbacktrace/mmap.c ++++ b/src/libbacktrace/mmap.c +@@ -140,7 +140,7 @@ backtrace_alloc (struct backtrace_state *state, + { + /* Allocate a new page. */ + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + asksize = (size + pagesize - 1) & ~ (pagesize - 1); + page = mmap (NULL, asksize, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); +@@ -181,7 +181,7 @@ backtrace_free (struct backtrace_state *state, void *addr, size_t size, + { + size_t pagesize; + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + if (((uintptr_t) addr & (pagesize - 1)) == 0 + && (size & (pagesize - 1)) == 0) + { +@@ -226,7 +226,7 @@ backtrace_vector_grow (struct backtrace_state *state,size_t size, + size_t alc; + void *base; + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + alc = vec->size + size; + if (vec->size == 0) + alc = 16 * size; +diff --git a/src/libbacktrace/mmapio.c b/src/libbacktrace/mmapio.c +index dfdaf6fa52..5b23003090 100644 +--- a/src/libbacktrace/mmapio.c ++++ b/src/libbacktrace/mmapio.c +@@ -60,7 +60,7 @@ backtrace_get_view (struct backtrace_state *state ATTRIBUTE_UNUSED, + off_t pageoff; + void *map; + +- pagesize = getpagesize (); ++ pagesize = sysconf(_SC_PAGESIZE); + inpage = offset % pagesize; + pageoff = offset - inpage; +

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 22343: Make 'Save Page As' obey first-party isolation
by gk＠torproject.org 15 Nov '18

15 Nov '18

commit c2b7e89ecaf3ea6a14a650a0a71c6dc3ebb02c50 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue May 30 10:25:34 2017 -0700 Bug 22343: Make 'Save Page As' obey first-party isolation Fixes: * File menu: - Save Page As * Context menu in content pages: - Save Page As - Save Image As - Save Video As - Save Link As - Save Frame As * Page Info "Media" Panel: - Save As --- browser/base/content/browser.js | 2 +- browser/base/content/nsContextMenu.js | 39 ++++++++++++++++++-------- browser/base/content/pageinfo/pageInfo.js | 5 ++-- browser/base/content/utilityOverlay.js | 6 ++-- dom/webbrowserpersist/nsIWebBrowserPersist.idl | 9 +++++- dom/webbrowserpersist/nsWebBrowserPersist.cpp | 18 ++++++++++-- dom/webbrowserpersist/nsWebBrowserPersist.h | 2 ++ mobile/android/chrome/content/browser.js | 6 ++-- netwerk/base/LoadContextInfo.cpp | 18 ++++++++++-- toolkit/components/browser/nsWebBrowser.cpp | 12 ++++++++ toolkit/content/contentAreaUtils.js | 32 +++++++++++++++------ 11 files changed, 115 insertions(+), 34 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 0fc6a72daf66..5eed34e08086 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -6175,7 +6175,7 @@ function handleLinkClick(event, href, linkNode) { if (where == "save") { saveURL(href, linkNode ? gatherTextUnder(linkNode) : "", null, true, - true, doc.documentURIObject, doc); + true, doc.documentURIObject, doc, undefined, doc.nodePrincipal); event.preventDefault(); return true; } diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js index 368d0475ac34..37ebde22ea07 100644 --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -989,9 +989,11 @@ nsContextMenu.prototype = { let onMessage = (message) => { mm.removeMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage); let dataURL = message.data.dataURL; + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(dataURL), this.principal.originAttributes); saveImageURL(dataURL, name, "SaveImageTitle", true, false, document.documentURIObject, null, null, null, - isPrivate); + isPrivate, principal); }; mm.addMessageListener("ContextMenu:SaveVideoFrameAsImage:Result", onMessage); }, @@ -1063,7 +1065,7 @@ nsContextMenu.prototype = { // Helper function to wait for appropriate MIME-type headers and // then prompt the user with a file picker saveHelper(linkURL, linkText, dialogTitle, bypassCache, doc, docURI, - windowID, linkDownload, isContentWindowPrivate) { + windowID, linkDownload, isContentWindowPrivate, contentPrincipal) { // canonical def in nsURILoader.h const NS_ERROR_SAVE_LINK_AS_TIMEOUT = 0x805d0020; @@ -1116,7 +1118,7 @@ nsContextMenu.prototype = { // do it the old fashioned way, which will pick the best filename // it can without waiting. saveURL(linkURL, linkText, dialogTitle, bypassCache, false, docURI, - doc, isContentWindowPrivate); + doc, isContentWindowPrivate, contentPrincipal); } if (this.extListener) this.extListener.onStopRequest(aRequest, aContext, aStatusCode); @@ -1156,10 +1158,13 @@ nsContextMenu.prototype = { } }; + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(linkURL), this.principal.originAttributes); + // setting up a new channel for 'right click - save link as ...' var channel = NetUtil.newChannel({ uri: makeURI(linkURL), - loadingPrincipal: this.principal, + loadingPrincipal: principal, contentPolicyType: Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD, securityFlags: Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS, }); @@ -1201,14 +1206,17 @@ nsContextMenu.prototype = { // Save URL of clicked-on link. saveLink() { - urlSecurityCheck(this.linkURL, this.principal); + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(this.linkURL), this.principal.originAttributes); + urlSecurityCheck(this.linkURL, principal); let isContentWindowPrivate = this.isRemote ? this.ownerDoc.isPrivate : undefined; this.saveHelper(this.linkURL, this.linkTextStr, null, true, this.ownerDoc, gContextMenuContentData.documentURIObject, this.frameOuterWindowID, this.linkDownload, - isContentWindowPrivate); + isContentWindowPrivate, + principal); }, // Backwards-compatibility wrapper @@ -1223,23 +1231,32 @@ nsContextMenu.prototype = { let isContentWindowPrivate = this.isRemote ? this.ownerDoc.isPrivate : undefined; let referrerURI = gContextMenuContentData.documentURIObject; let isPrivate = PrivateBrowsingUtils.isBrowserPrivate(this.browser); + let thisPrincipal = this.principal; if (this.onCanvas) { // Bypass cache, since it's a data: URL. this._canvasToBlobURL(this.target).then(function(blobURL) { + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(blobURL), thisPrincipal.originAttributes); saveImageURL(blobURL, "canvas.png", "SaveImageTitle", true, false, referrerURI, null, null, null, - isPrivate); + isPrivate, principal); }, Cu.reportError); } else if (this.onImage) { - urlSecurityCheck(this.mediaURL, this.principal); + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(this.mediaURL), thisPrincipal.originAttributes); + urlSecurityCheck(this.mediaURL, principal); saveImageURL(this.mediaURL, null, "SaveImageTitle", false, false, referrerURI, null, gContextMenuContentData.contentType, - gContextMenuContentData.contentDisposition, isPrivate); + gContextMenuContentData.contentDisposition, isPrivate, + principal); } else if (this.onVideo || this.onAudio) { - urlSecurityCheck(this.mediaURL, this.principal); + const principal = Services.scriptSecurityManager.createCodebasePrincipal( + makeURI(this.mediaURL), thisPrincipal.originAttributes); + urlSecurityCheck(this.mediaURL, principal); var dialogTitle = this.onVideo ? "SaveVideoTitle" : "SaveAudioTitle"; this.saveHelper(this.mediaURL, null, dialogTitle, false, doc, referrerURI, - this.frameOuterWindowID, "", isContentWindowPrivate); + this.frameOuterWindowID, "", isContentWindowPrivate, + principal); } }, diff --git a/browser/base/content/pageinfo/pageInfo.js b/browser/base/content/pageinfo/pageInfo.js index 86f548c74494..efe24f7487d9 100644 --- a/browser/base/content/pageinfo/pageInfo.js +++ b/browser/base/content/pageinfo/pageInfo.js @@ -696,7 +696,7 @@ function saveMedia() { titleKey = "SaveAudioTitle"; saveURL(url, null, titleKey, false, false, makeURI(item.baseURI), - null, gDocInfo.isContentWindowPrivate); + null, gDocInfo.isContentWindowPrivate, gDocInfo.principal); } } else { selectSaveFolder(function(aDirectory) { @@ -704,7 +704,8 @@ function saveMedia() { var saveAnImage = function(aURIString, aChosenData, aBaseURI) { uniqueFile(aChosenData.file); internalSave(aURIString, null, null, null, null, false, "SaveImageTitle", - aChosenData, aBaseURI, null, false, null, gDocInfo.isContentWindowPrivate); + aChosenData, aBaseURI, null, false, null, gDocInfo.isContentWindowPrivate, + gDocInfo.principal); }; for (var i = 0; i < rowArray.length; i++) { diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index b73a01a0b0f3..4cd7d91e4e9a 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -258,14 +258,16 @@ function openLinkIn(url, where, params) { // ContentClick.jsm passes isContentWindowPrivate for saveURL instead of passing a CPOW initiatingDoc if ("isContentWindowPrivate" in params) { - saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, null, params.isContentWindowPrivate); + saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, + null, params.isContentWindowPrivate, + aPrincipal || aTriggeringPrincipal); } else { if (!aInitiatingDoc) { Cu.reportError("openUILink/openLinkIn was called with " + "where == 'save' but without initiatingDoc. See bug 814264."); return; } - saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, aInitiatingDoc); + saveURL(url, null, null, true, true, aNoReferrer ? null : aReferrerURI, aInitiatingDoc, params.isContentWindowPrivate, aPrincipal || aTriggeringPrincipal); } return; } diff --git a/dom/webbrowserpersist/nsIWebBrowserPersist.idl b/dom/webbrowserpersist/nsIWebBrowserPersist.idl index 8de84f5e2904..62ac1c1cd7bd 100644 --- a/dom/webbrowserpersist/nsIWebBrowserPersist.idl +++ b/dom/webbrowserpersist/nsIWebBrowserPersist.idl @@ -13,11 +13,12 @@ interface nsIWebProgressListener; interface nsIFile; interface nsIChannel; interface nsILoadContext; +interface nsIPrincipal; /** * Interface for persisting DOM documents and URIs to local or remote storage. */ -[scriptable, uuid(8cd752a4-60b1-42c3-a819-65c7a1138a28)] +[scriptable, uuid(ccdbc750-be09-4f11-bb01-4e0a4db76c41)] interface nsIWebBrowserPersist : nsICancelable { /** No special persistence behaviour. */ @@ -112,6 +113,12 @@ interface nsIWebBrowserPersist : nsICancelable attribute nsIWebProgressListener progressListener; /** + * This attribute can be used to set the loading principal + * of the document or URI to be persisted. + */ + attribute nsIPrincipal loadingPrincipal; + + /** * Save the specified URI to file. * * @param aURI URI to save to file. Some implementations of this interface diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.cpp b/dom/webbrowserpersist/nsWebBrowserPersist.cpp index fd6d9d0d9315..4f49b63475f3 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.cpp +++ b/dom/webbrowserpersist/nsWebBrowserPersist.cpp @@ -277,6 +277,7 @@ const char *kWebBrowserPersistStringBundle = nsWebBrowserPersist::nsWebBrowserPersist() : mCurrentDataPathIsRelative(false), mCurrentThingsToPersist(0), + mLoadingPrincipal(nsContentUtils::GetSystemPrincipal()), mFirstAndOnlyUse(true), mSavingDocument(false), mCancel(false), @@ -413,6 +414,19 @@ NS_IMETHODIMP nsWebBrowserPersist::SetProgressListener( return NS_OK; } +NS_IMETHODIMP nsWebBrowserPersist::GetLoadingPrincipal(nsIPrincipal** loadingPrincipal) +{ + *loadingPrincipal = mLoadingPrincipal; + return NS_OK; +} + +NS_IMETHODIMP nsWebBrowserPersist::SetLoadingPrincipal(nsIPrincipal* loadingPrincipal) +{ + mLoadingPrincipal = loadingPrincipal ? loadingPrincipal : + nsContentUtils::GetSystemPrincipal(); + return NS_OK; +} + NS_IMETHODIMP nsWebBrowserPersist::SaveURI( nsIURI *aURI, nsISupports *aCacheKey, nsIURI *aReferrer, uint32_t aReferrerPolicy, @@ -1385,7 +1399,7 @@ nsresult nsWebBrowserPersist::SaveURIInternal( nsCOMPtr<nsIChannel> inputChannel; rv = NS_NewChannel(getter_AddRefs(inputChannel), aURI, - nsContentUtils::GetSystemPrincipal(), + mLoadingPrincipal, nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_OTHER, nullptr, // aPerformanceStorage @@ -2756,7 +2770,7 @@ nsWebBrowserPersist::CreateChannelFromURI(nsIURI *aURI, nsIChannel **aChannel) rv = NS_NewChannel(aChannel, aURI, - nsContentUtils::GetSystemPrincipal(), + mLoadingPrincipal, nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_OTHER); NS_ENSURE_SUCCESS(rv, rv); diff --git a/dom/webbrowserpersist/nsWebBrowserPersist.h b/dom/webbrowserpersist/nsWebBrowserPersist.h index 17b570d783e7..f95300be12cb 100644 --- a/dom/webbrowserpersist/nsWebBrowserPersist.h +++ b/dom/webbrowserpersist/nsWebBrowserPersist.h @@ -147,6 +147,8 @@ private: nsCOMPtr<nsIMIMEService> mMIMEService; nsCOMPtr<nsIURI> mURI; nsCOMPtr<nsIWebProgressListener> mProgressListener; + nsCOMPtr<nsIPrincipal> mLoadingPrincipal; + /** * Progress listener for 64-bit values; this is the same object as * mProgressListener, but is a member to avoid having to qi it for each diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index d081fde9b20e..51fe1422acc5 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -886,10 +886,10 @@ var BrowserApp = { if (!permissionGranted) { return; } - + let doc = aTarget.ownerDocument; ContentAreaUtils.saveImageURL(aTarget.currentRequestFinalURI.spec, null, "SaveImageTitle", - false, true, aTarget.ownerDocument.documentURIObject, - aTarget.ownerDocument); + false, true, doc.documentURIObject, + null, null, null, doc.isPrivate, doc.nodePrincipal); }); }); diff --git a/netwerk/base/LoadContextInfo.cpp b/netwerk/base/LoadContextInfo.cpp index 79f870e8d20d..1218345b63ed 100644 --- a/netwerk/base/LoadContextInfo.cpp +++ b/netwerk/base/LoadContextInfo.cpp @@ -121,8 +121,6 @@ GetLoadContextInfo(nsIChannel * aChannel) { nsresult rv; - DebugOnly<bool> pb = NS_UsePrivateBrowsing(aChannel); - bool anon = false; nsLoadFlags loadFlags; rv = aChannel->GetLoadFlags(&loadFlags); @@ -132,7 +130,21 @@ GetLoadContextInfo(nsIChannel * aChannel) OriginAttributes oa; NS_GetOriginAttributes(aChannel, oa); - MOZ_ASSERT(pb == (oa.mPrivateBrowsingId > 0)); + +#ifdef DEBUG + nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo(); + if (loadInfo) { + nsCOMPtr<nsIPrincipal> principal = loadInfo->LoadingPrincipal(); + if (principal) { + bool chrome; + principal->GetIsSystemPrincipal(&chrome); + if (!chrome) { + bool pb = NS_UsePrivateBrowsing(aChannel); + MOZ_ASSERT(pb == (oa.mPrivateBrowsingId > 0)); + } + } + } +#endif return new LoadContextInfo(anon, oa); } diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp index 40ac82210502..ff1e728243b4 100644 --- a/toolkit/components/browser/nsWebBrowser.cpp +++ b/toolkit/components/browser/nsWebBrowser.cpp @@ -997,6 +997,18 @@ nsWebBrowser::SetProgressListener(nsIWebProgressListener* aProgressListener) } NS_IMETHODIMP +nsWebBrowser::GetLoadingPrincipal(nsIPrincipal** loadingPrincipal) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP +nsWebBrowser::SetLoadingPrincipal(nsIPrincipal* loadingPrincipal) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP nsWebBrowser::SaveURI(nsIURI* aURI, nsISupports* aCacheKey, nsIURI* aReferrer, diff --git a/toolkit/content/contentAreaUtils.js b/toolkit/content/contentAreaUtils.js index 48cf448798a5..e213a0e4333e 100644 --- a/toolkit/content/contentAreaUtils.js +++ b/toolkit/content/contentAreaUtils.js @@ -62,14 +62,14 @@ function forbidCPOW(arg, func, argname) { // - A linked document using Alt-click Save Link As... // function saveURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, - aSkipPrompt, aReferrer, aSourceDocument, aIsContentWindowPrivate) { + aSkipPrompt, aReferrer, aSourceDocument, aIsContentWindowPrivate, + aContentPrincipal) { forbidCPOW(aURL, "saveURL", "aURL"); forbidCPOW(aReferrer, "saveURL", "aReferrer"); // Allow aSourceDocument to be a CPOW. - internalSave(aURL, null, aFileName, null, null, aShouldBypassCache, aFilePickerTitleKey, null, aReferrer, aSourceDocument, - aSkipPrompt, null, aIsContentWindowPrivate); + aSkipPrompt, null, aIsContentWindowPrivate, aContentPrincipal); } // Just like saveURL, but will get some info off the image before @@ -109,10 +109,12 @@ const nsISupportsCString = Ci.nsISupportsCString; * @param aIsContentWindowPrivate (bool) * Whether or not the containing window is in private browsing mode. * Does not need to be provided is aDoc is passed. + * @param aContentPrincipal [optional] + * The principal to be used for fetching and saving the target URL. */ function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, aSkipPrompt, aReferrer, aDoc, aContentType, aContentDisp, - aIsContentWindowPrivate) { + aIsContentWindowPrivate, aContentPrincipal) { forbidCPOW(aURL, "saveImageURL", "aURL"); forbidCPOW(aReferrer, "saveImageURL", "aReferrer"); @@ -156,7 +158,8 @@ function saveImageURL(aURL, aFileName, aFilePickerTitleKey, aShouldBypassCache, internalSave(aURL, null, aFileName, aContentDisp, aContentType, aShouldBypassCache, aFilePickerTitleKey, null, aReferrer, - null, aSkipPrompt, null, aIsContentWindowPrivate); + null, aSkipPrompt, null, aIsContentWindowPrivate, + aContentPrincipal); } // This is like saveDocument, but takes any browser/frame-like element @@ -170,7 +173,7 @@ function saveBrowser(aBrowser, aSkipPrompt, aOuterWindowID = 0) { let stack = Components.stack.caller; persistable.startPersistence(aOuterWindowID, { onDocumentReady(document) { - saveDocument(document, aSkipPrompt); + saveDocument(document, aSkipPrompt, aBrowser.contentPrincipal); }, onError(status) { throw new Components.Exception("saveBrowser failed asynchronously in startPersistence", @@ -186,7 +189,9 @@ function saveBrowser(aBrowser, aSkipPrompt, aOuterWindowID = 0) { // case "save as" modes that serialize the document's DOM are // unavailable. This is a temporary measure for the "Save Frame As" // command (bug 1141337) and pre-e10s add-ons. -function saveDocument(aDocument, aSkipPrompt) { +// +// aContentPrincipal is the principal for downloading and saving the document. +function saveDocument(aDocument, aSkipPrompt, aContentPrincipal) { if (!aDocument) throw "Must have a document when calling saveDocument"; @@ -241,7 +246,7 @@ function saveDocument(aDocument, aSkipPrompt) { internalSave(aDocument.documentURI, aDocument, null, contentDisposition, aDocument.contentType, false, null, null, aDocument.referrer ? makeURI(aDocument.referrer) : null, - aDocument, aSkipPrompt, cacheKey); + aDocument, aSkipPrompt, cacheKey, undefined, aContentPrincipal); } function DownloadListener(win, transfer) { @@ -350,11 +355,13 @@ XPCOMUtils.defineConstant(this, "kSaveAsType_Text", kSaveAsType_Text); * This parameter is provided when the aInitiatingDocument is not a * real document object. Stores whether aInitiatingDocument.defaultView * was private or not. + * @param aContentPrincipal [optional] + * The principal to be used for fetching and saving the target URL. */ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, aContentType, aShouldBypassCache, aFilePickerTitleKey, aChosenData, aReferrer, aInitiatingDocument, aSkipPrompt, - aCacheKey, aIsContentWindowPrivate) { + aCacheKey, aIsContentWindowPrivate, aContentPrincipal) { forbidCPOW(aURL, "internalSave", "aURL"); forbidCPOW(aReferrer, "internalSave", "aReferrer"); forbidCPOW(aCacheKey, "internalSave", "aCacheKey"); @@ -423,6 +430,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, let nonCPOWDocument = aDocument && !Cu.isCrossProcessWrapper(aDocument); + let isPrivate = aIsContentWindowPrivate; if (isPrivate === undefined) { isPrivate = aInitiatingDocument instanceof Ci.nsIDOMDocument @@ -440,6 +448,7 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, sourcePostData: nonCPOWDocument ? getPostData(aDocument) : null, bypassCache: aShouldBypassCache, isPrivate, + loadingPrincipal: aContentPrincipal, }; // Start the actual save process @@ -476,10 +485,15 @@ function internalSave(aURL, aDocument, aDefaultFileName, aContentDisposition, * If true, the document will always be refetched from the server * @param persistArgs.isPrivate * Indicates whether this is taking place in a private browsing context. + * @param persistArgs.loadingPrincipal + * The principal assigned to the document being saved. */ function internalPersist(persistArgs) { var persist = makeWebBrowserPersist(); + if (["http", "https", "ftp"].includes(persistArgs.sourceURI.scheme)) { + persist.loadingPrincipal = persistArgs.loadingPrincipal; + } // Calculate persist flags. const nsIWBP = Ci.nsIWebBrowserPersist; const flags = nsIWBP.PERSIST_FLAGS_REPLACE_EXISTING_FILES |

1 0

[tor-browser-build/master] Bug 28436: Update link to gn cross_compiles.md.
by boklm＠torproject.org 14 Nov '18

14 Nov '18

commit c50a316848b6efad58644a1c85594b8e92c9b2ff Author: David Fifield <david(a)bamsoftware.com> Date: Tue Nov 13 16:17:07 2018 -0700 Bug 28436: Update link to gn cross_compiles.md. --- projects/webrtc/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index d3975b3..5a6cece 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -92,7 +92,7 @@ EOF export GN_ARGS="" # For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". -# https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… +# https://gn.googlesource.com/gn/+/master/docs/cross_compiles.md # Not debug. GN_ARGS+=" is_debug=false" # There are warnings from unused returns.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 14 Nov '18

14 Nov '18

commit c4f92596551ae6651a25be34f330a14776d2e09e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 14 15:11:31 2018 +0000 Translations update --- src/chrome/locale/de/browserOnboarding.properties | 16 ++++++++-------- src/chrome/locale/ko/torbutton.dtd | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties index 1243128c..d57b3f15 100644 --- a/src/chrome/locale/de/browserOnboarding.properties +++ b/src/chrome/locale/de/browserOnboarding.properties @@ -15,11 +15,11 @@ onboarding.tour-tor-privacy.button=Öffne Tor-Netzwerk onboarding.tour-tor-network=Tor-Netzwerk onboarding.tour-tor-network.title=Bereise ein dezentrales Netzwerk. onboarding.tour-tor-network.description=Der Tor Browser verbindet sich mit dem Tor-Netzwerk, das von tausenden Freiwilligen betrieben wird. Anders als bei einem VPN gibt es keinen zentralen Punkt, dem vertraut werden muss, um das Internet privat zu nutzen. -onboarding.tour-tor-network.button=Circuit-Ansicht öffnen +onboarding.tour-tor-network.button=Kanal-Ansicht öffnen -onboarding.tour-tor-circuit-display=Circuit-Ansicht +onboarding.tour-tor-circuit-display=Kanal-Ansicht onboarding.tour-tor-circuit-display.title=Zeige deinen Pfad -onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Pfad erneut zu laden, klicke auf das Informations-Symbol in der Adressleiste und wähle "Neuer Pfad für diese Seite". +onboarding.tour-tor-circuit-display.description=Für jede Webseite wandern Anfragen und Antworten mehrfach verschlüsselt über drei Server (Relays) um die Welt. Keine Webseite weiß, woher die Verbindung ursprünglich kommt. Um eine Webseite über einen neuen Kanal erneut zu laden, öffne die Kanal-Ansicht und klicke "Neuer Kanal für diese Seite". onboarding.tour-tor-circuit-display.button=Meinen Pfad sehen onboarding.tour-tor-security=Sicherheit @@ -44,11 +44,11 @@ onboarding.tor-circuit-display.one-of-three=1 von 3 onboarding.tor-circuit-display.two-of-three=2 von 3 onboarding.tor-circuit-display.three-of-three=3 von 3 -onboarding.tor-circuit-display.intro.title=Wie funktionieren Circuits? -onboarding.tor-circuit-display.intro.msg=Circuits bestehen aus zufällig zugeordneten Relays, d.h. Computern auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Circuits ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n +onboarding.tor-circuit-display.intro.title=Wie funktionieren Kanäle? +onboarding.tor-circuit-display.intro.msg=Kanäle bestehen aus zufällig zugeordneten Relays, d.h. Server auf der ganzen Welt, die konfiguriert sind, um Torverkehr weiterzuleiten. Kanäle ermöglichen es Ihnen, privat zu surfen und sich mit Onion-Diensten zu verbinden.\n -onboarding.tor-circuit-display.diagram.title=Circuit-Ansicht -onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, aus denen die Circuits für diese Website besteht. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, erhält jede Website einen anderen Circuit. +onboarding.tor-circuit-display.diagram.title=Kanal-Ansicht +onboarding.tor-circuit-display.diagram.msg=Dieses Diagramm zeigt die Relays, die den Kanal für diese Website bilden. Um zu verhindern, dass Aktivitäten zwischen verschiedenen Standorten verlinkt werden, nutzt Tor Browser für jede Website einen eigenen Kanal. onboarding.tor-circuit-display.new-circuit.title=Brauchen Sie einen neuen Circuit? -onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Circuit zu laden. +onboarding.tor-circuit-display.new-circuit.msg=Wenn Sie keine Verbindung zu der Website herstellen können, die Sie besuchen möchten, oder wenn sie nicht richtig geladen wird, können Sie diese Schaltfläche verwenden, um die Website über einen neuen Kanal zu laden. diff --git a/src/chrome/locale/ko/torbutton.dtd b/src/chrome/locale/ko/torbutton.dtd index 5daf9f14..b23701b2 100644 --- a/src/chrome/locale/ko/torbutton.dtd +++ b/src/chrome/locale/ko/torbutton.dtd @@ -34,18 +34,18 @@ <!ENTITY torbutton.prefs.sec_caption "보안 등급"> <!ENTITY torbutton.prefs.sec_caption_tooltip "보안 슬라이더를 사용하면 특정 브라우저 기능이 비활성화 되어 브라우저가 해킹 시도에 취약해질 수 있습니다."> <!ENTITY torbutton.prefs.sec_standard_label "표준"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> +<!ENTITY torbutton.prefs.sec_standard_description "모든 Tor 브라우저와 웹사이트의 기능들이 활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_safer_label "더 안전합니다"> +<!ENTITY torbutton.prefs.sec_safer_description "이 설정으로 흔히 위험한 웹사이트의 기능이 비활성화하면 일부의 사이트의 기능들을 사용 할 수 없습니다."> +<!ENTITY torbutton.prefs.sec_safer_list_label "더 안전한 설정을 선택하고 있습니다:"> +<!ENTITY torbutton.prefs.sec_safest_label "제일 안전합니다"> +<!ENTITY torbutton.prefs.sec_safest_description "정적 사이트와 기본 서비스에 필요한 기능이만 용남합니다. 그 변경들은 사진이며 메디아며 스크립트를 영향할 것입니다."> +<!ENTITY torbutton.prefs.sec_safest_list_label "제일 안전한 설정을 선택하고 있습니다:"> <!ENTITY torbutton.prefs.sec_learn_more_label "더 알아보기"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript가 HTTPS을 적용되지 않은 사이트에서 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_js_disabled "자바 스크립트는 기본 설정으로 모든 사이트에서 비활성화 되어 있습니다."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> +<!ENTITY torbutton.prefs.sec_limit_typography "일부 글꼴이며 수학기호가 비활성화 됩니다."> +<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "일부 글꼴이며 상징이며 수학기호며 사진이 비활성화 됩니다."> <!ENTITY torbutton.prefs.sec_click_to_play_media "오디오와 동영상(HTML5 media) 보려면 누르십시오."> <!ENTITY torbutton.circuit_display.title "토르 서킷"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.new_circuit "이 사이트에서 새로운 서킷을 재구축">

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 25013: Add torbutton as a tor-browser submodule
by gk＠torproject.org 14 Nov '18

14 Nov '18

commit fbccad5b7b28a975f2e9de73f8362fcf937db6aa Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Nov 13 07:23:52 2018 -0200 Bug 25013: Add torbutton as a tor-browser submodule Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. --- .gitmodules | 3 +++ mobile/android/installer/package-manifest.in | 4 ++++ toolkit/moz.build | 3 +++ toolkit/torproject/torbutton | 1 + 4 files changed, 11 insertions(+) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000000..2f03bd8e22df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "toolkit/torproject/torbutton"] + path = toolkit/torproject/torbutton + url = https://git.torproject.org/torbutton.git diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 8a2a356c151c..69714f9eca7c 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -426,6 +426,10 @@ @BINPATH@/chrome/devtools@JAREXT@ @BINPATH@/chrome/devtools.manifest +; Torbutton +@BINPATH@/chrome/torbutton@JAREXT@ +@BINPATH@/chrome/torbutton.manifest + ; [Default Preferences] ; All the pref files must be part of base to prevent migration bugs #ifdef MOZ_GECKOVIEW_JAR diff --git a/toolkit/moz.build b/toolkit/moz.build index df0b09d3bc0f..ba89c51efea1 100644 --- a/toolkit/moz.build +++ b/toolkit/moz.build @@ -28,6 +28,9 @@ if CONFIG['MOZ_MAINTENANCE_SERVICE'] or CONFIG['MOZ_UPDATER']: 'mozapps/update/common', ] +if CONFIG['MOZ_BUILD_APP'] == 'mobile/android': + DIRS += ['torproject/torbutton'] + if CONFIG['MOZ_MAINTENANCE_SERVICE']: DIRS += [ 'components/maintenanceservice' diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton new file mode 160000 index 000000000000..ac8d92514940 --- /dev/null +++ b/toolkit/torproject/torbutton @@ -0,0 +1 @@ +Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd

1 0

[torbutton/master] Translations update
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit ac8d9251494056e761bb2cf5c2a4795a888f38bd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:24:11 2018 +0000 Translations update --- src/chrome/locale/ar/aboutTBUpdate.dtd | 2 +- src/chrome/locale/cs/aboutTor.dtd | 4 +- src/chrome/locale/cs/brand.properties | 4 +- src/chrome/locale/cs/torbutton.properties | 4 +- src/chrome/locale/da/torbutton.properties | 2 +- src/chrome/locale/el/aboutDialog.dtd | 2 +- src/chrome/locale/el/aboutTor.dtd | 8 +-- src/chrome/locale/el/browserOnboarding.properties | 8 +-- src/chrome/locale/fr/aboutDialog.dtd | 2 +- src/chrome/locale/fr/aboutTor.dtd | 2 +- src/chrome/locale/fr/brand.dtd | 2 +- src/chrome/locale/ja/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ja/aboutTor.dtd | 14 ++--- src/chrome/locale/ja/browserOnboarding.properties | 8 +-- src/chrome/locale/ka/torbutton.properties | 2 +- src/chrome/locale/sv/aboutTBUpdate.dtd | 6 +- src/chrome/locale/sv/aboutTor.dtd | 38 ++++++------- src/chrome/locale/sv/browserOnboarding.properties | 68 +++++++++++------------ src/chrome/locale/sv/torbutton.properties | 4 +- src/chrome/locale/tr/browserOnboarding.properties | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/aboutTor.dtd | 20 +++---- 22 files changed, 103 insertions(+), 103 deletions(-) diff --git a/src/chrome/locale/ar/aboutTBUpdate.dtd b/src/chrome/locale/ar/aboutTBUpdate.dtd index eee3db56..0c25a117 100644 --- a/src/chrome/locale/ar/aboutTBUpdate.dtd +++ b/src/chrome/locale/ar/aboutTBUpdate.dtd @@ -6,5 +6,5 @@ <!ENTITY aboutTBUpdate.changeLogHeading "سجل التغييرات:"> <!ENTITY aboutTBUpdate.circuitDisplayHeading "تصميم جديد لطريقة عرض الدوائر"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "عرض دوائر تور نقل إلى مكان آخر وخضع للتحسين. انقر على زر «هوية الموقع» (تجده يمين شريط العنوانين) لترى العرض الجديد."> <!ENTITY aboutTBUpdate.learnMore "إعرف/ي أكثر "> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 435bdfdc..7c5ba384 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -7,8 +7,8 @@ <!ENTITY aboutTor.title "O Toru"> <!ENTITY aboutTor.ready.label "Prohlížejte v soukromí."> -<!ENTITY aboutTor.ready2.label "Vše je připraveno pro maximální soukromí pro vaše prohlížení."> -<!ENTITY aboutTor.failure.label "Něco se nepovedlo!"> +<!ENTITY aboutTor.ready2.label "Vše je připraveno pro maximální soukromí Vašeho prohlížení."> +<!ENTITY aboutTor.failure.label "Něco se pokazilo!"> <!ENTITY aboutTor.failure2.label "Tor v tomto prohlížeči nefunguje."> <!ENTITY aboutTor.search.label "Vyhledejte s DuckDuckGo"> diff --git a/src/chrome/locale/cs/brand.properties b/src/chrome/locale/cs/brand.properties index 1ac05c0b..7a8228a1 100644 --- a/src/chrome/locale/cs/brand.properties +++ b/src/chrome/locale/cs/brand.properties @@ -7,10 +7,10 @@ brandShortName=Prohlížeč Tor brandFullName=Prohlížeč Tor vendorShortName=Tor Project -homePageSingleStartMain=Firefox Start, domovská stránka s vestavěných vyhledávačem +homePageSingleStartMain=Firefox Start, domovská stránka s vestavěným vyhledávačem homePageImport=Importovat vaši domovskou stránku z aplikace %S homePageMigrationPageTitle=Výběr domovské stránky -homePageMigrationDescription=Vyberte prosím domovskou stránku, kterou chcete používat: +homePageMigrationDescription=Vyberte prosím domovskou stránku, kterou si přejete používat: syncBrandShortName=Synchronizace diff --git a/src/chrome/locale/cs/torbutton.properties b/src/chrome/locale/cs/torbutton.properties index ef9b8092..acbe680a 100644 --- a/src/chrome/locale/cs/torbutton.properties +++ b/src/chrome/locale/cs/torbutton.properties @@ -21,10 +21,10 @@ torbutton.popup.external.suggest = Chcete-li být v bezpečí, otevírejte staž torbutton.popup.launch = Stáhnout soubor torbutton.popup.cancel = Zrušit torbutton.popup.dontask = Od teď stahovat soubory automaticky -torbutton.popup.no_newnym = Torbutton vám nemůže bezpečně poskytnout novou identitu, protože nemá přístup ke controlnímu portu Tor.\n\nMáte spuštěn Tor Browser Bundle? +torbutton.popup.no_newnym = Torbutton vám nemůže bezpečně poskytnout novou identitu, protože nemá přístup ke kontrolnímu portu Tor.\n\nMáte spuštěn Tor Browser Bundle? torbutton.security_settings.menu.title = Nastavení zabezpečení torbutton.title.prompt_torbrowser = Důležitá zpráva Torbutton -torbutton.popup.prompt_torbrowser = Torbutton nyní pracuje jinak: nemůžete jej nyní vypnout.\n\nPro tuto změnu jsme se rozhodli kvůli bezpečnosti používvání Torbutton v prohlížeči. který je zároveň využíván pro prohlížení mimo síť Tor. Docházelo kvůli tomu k příliš mnoha chybám, které jsme nemohli jinak opravit.\n\nPokud chcete dále používat Firefox běžným způsobem, nainstalujte si Tor Browser Bundle. Nastavení soukromí prohlížeče Tor jsou nadřazeny těm ve Firefoxu, dokonce i když Firefox používáte společně s Torbutton. \n\nTorbutton můžete odstranit v Nástroje > Doplňky > Rozšíření a klepnutím na tlačítko Odebrat. +torbutton.popup.prompt_torbrowser = Torbutton nyní pracuje jinak: nemůžete jej nyní vypnout.\n\nPro tuto změnu jsme se rozhodli kvůli bezpečnosti používání Torbutton v prohlížeči. který je zároveň využíván pro prohlížení mimo síť Tor. Docházelo kvůli tomu k příliš mnoha chybám, které jsme nemohli jinak opravit.\n\nPokud chcete dále používat Firefox běžným způsobem, nainstalujte si Tor Browser Bundle. Nastavení soukromí prohlížeče Tor jsou nadřazeny těm ve Firefoxu, dokonce i když Firefox používáte společně s Torbutton. \n\nTorbutton můžete odstranit v Nástroje > Doplňky > Rozšíření a klepnutím na tlačítko Odebrat. torbutton.popup.short_torbrowser = Důležitá informace!\n\nTorbutton je nyní stále aktivní.\n\nPro více informací klepněte na Torbutton. torbutton.popup.confirm_plugins = Zásuvné moduly, jako je třeba Flash, mohou narušit vaše soukromí a anonymitu.\n\nTaké mohou obejít Tor a vyzradit vaše umístění a IP adresu.\n\nOpravdu chcete zásuvné moduly povolit?\n\n diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties index eaf46742..ef2e85a9 100644 --- a/src/chrome/locale/da/torbutton.properties +++ b/src/chrome/locale/da/torbutton.properties @@ -16,7 +16,7 @@ torbutton.panel.label.enabled = Tor aktiveret extensions.torbutton(a)torproject.org.description = Torbutton tilbyder en knap, der konfigurerer Tor-indstillinger, samt hurtigt og nemt fjerner private data browsing-data. torbutton.popup.external.title = Download en ekstern filtype? torbutton.popup.external.app = Tor Browser kan ikke vis denne file. Du skal derfor åbne den med et andet program.\n\n -torbutton.popup.external.note = Nogle filtyper kan lede programmer til at forbinde til internettet uden at bruge Tor.\n\n +torbutton.popup.external.note = Nogle filtyper kan lede programmer til at oprette forbindelse til internettet uden at bruge Tor.\n\n torbutton.popup.external.suggest = For at være sikker bør du kun åbne downloade filer mens du er offline, eller bruge en Tor Live CD såsom Tails.\n torbutton.popup.launch = Download fil torbutton.popup.cancel = Annuller diff --git a/src/chrome/locale/el/aboutDialog.dtd b/src/chrome/locale/el/aboutDialog.dtd index a5c0cf69..d75b039e 100644 --- a/src/chrome/locale/el/aboutDialog.dtd +++ b/src/chrome/locale/el/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; έχει φτιαχτεί από">  <!ENTITY project.tpoLink "ο &vendorShortName;"> -<!ENTITY project.end ",μια μη κερδοσκοπική οργάνωση που υπερασπίζεται την ιδιωτικότητα και την ελευθερεία σας στο διαδύκτιο."> +<!ENTITY project.end ", μια μη κερδοσκοπική οργάνωση που υπερασπίζεται την ιδιωτικότητα και την ελευθερία σας στο διαδίκτυο."> <!ENTITY help.start "Θέλετε να βοηθήσετε?">  diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index 738b81ac..96301e2a 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> <!ENTITY aboutTor.ready.label "Εξερευνήστε. Με ιδιωτικότητα."> -<!ENTITY aboutTor.ready2.label "Είσαι έτοιμος για την πιο ιδιωτική εμπειρία περιήγησης."> +<!ENTITY aboutTor.ready2.label "Είστε έτοιμος για την πιο ιδιωτική εμπειρία περιήγησης."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser."> @@ -15,7 +15,7 @@ <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ερωτήσεις?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Κοιτάξτε το εγχειρίδιό μας για τον Tor Browser»"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Κοιτάξτε το εγχειρίδιο μας για τον Tor Browser »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Εγχειρίδιο του Tor Browser"> @@ -24,10 +24,10 @@ <!ENTITY aboutTor.getInvolved.label "Βοηθήστε κι εσείς »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενά σας."> +<!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Η ισχύς των πολλών. "> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Ισχύς εν τη ενώσει."> <!ENTITY aboutTor.donationBanner.line2a "Η ανωνυμία αγαπά την παρέα."> <!ENTITY aboutTor.donationBanner.line2b "Προωθήστε τα ανθρώπινα δικαιώματα παγκοσμίως."> diff --git a/src/chrome/locale/el/browserOnboarding.properties b/src/chrome/locale/el/browserOnboarding.properties index 766e982a..680a904d 100644 --- a/src/chrome/locale/el/browserOnboarding.properties +++ b/src/chrome/locale/el/browserOnboarding.properties @@ -13,7 +13,7 @@ onboarding.tour-tor-privacy.description=Ο Tor Browser απομονώνει τα onboarding.tour-tor-privacy.button=Πάμε στο Δίκτυο Tor onboarding.tour-tor-network=Δίκτυο Tor -onboarding.tour-tor-network.title=Ας ταξιδεύσουμε σε ένα αποκεντρωμένο δίκτυο. +onboarding.tour-tor-network.title=Ας ταξιδέψουμε σε ένα αποκεντρωμένο δίκτυο. onboarding.tour-tor-network.description=Ο Tor Browser σας συνδέει στο δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές από όλο τον κόσμο. Σε αντίθεση με ένα VPN, δεν υπάρχει κανένα σημείο αποτυχίας ή κεντρική οντότητα που πρέπει να εμπιστευτείτε για να απολαύσετε το διαδίκτυο ιδιωτικά. onboarding.tour-tor-network.button=Πάμε στην προεπισκόπηση κυκλώματος @@ -24,7 +24,7 @@ onboarding.tour-tor-circuit-display.button=Βλέπω το μονοπάτι μο onboarding.tour-tor-security=Ασφάλεια onboarding.tour-tor-security.title=Επιλέξτε την εμπειρία σας. -onboarding.tour-tor-security.description=Μπορούμε να προσφέρουμε επιπρόσθετες ρυθμίσεις για να ενισχύσουμε την ασφάλεια του περιηγητή σας. Οι Ρυθμίσεις Ασφάλειας σας επιτρέπουν να μπλοκάρεετε στοιχεία που θα μπορούσαν να χρηστιμοποιηθούν για επιθέσεις στον υπολογιστή σας. Επίλεξτε παρακάτω για να δείτε τι κάνουν οι διαφορετικές ρυθμίσεις. +onboarding.tour-tor-security.description=Μπορούμε να προσφέρουμε επιπρόσθετες ρυθμίσεις για να ενισχύσουμε την ασφάλεια του περιηγητή σας. Οι Ρυθμίσεις Ασφαλείας σας επιτρέπουν να μπλοκάρεετε στοιχεία που θα μπορούσαν να χρησιμοποιηθούν για επιθέσεις στον υπολογιστή σας. Επίλεξτε παρακάτω για να δείτε τι κάνουν οι διαφορετικές ρυθμίσεις. onboarding.tour-tor-security.button=Έλεγχος Ρυθμίσεων onboarding.tour-tor-expect-differences=Προτάσεις εμπειρίας @@ -34,7 +34,7 @@ onboarding.tour-tor-expect-differences.button=Δείτε τις Συχνές Ε onboarding.tour-tor-onion-services=Υπηρεσίες Onion onboarding.tour-tor-onion-services.title=Προστατευτείτε πιο πολύ. -onboarding.tour-tor-onion-services.description=Οι υπηρεσίες του Onion είναι ιστοσελίδες που τελειώνουν σε .onion και παρέχουν επιπλέον προστασία σε όσους δημοσιεύουν και επισκέπτονται, συμπεριλαμβανομένου και ασφαλειών ενάντια στη λογοκρισία. Οι υπηρεσίες του Onion επιτρέπουν στον καθένα να παράσχει υλικά και υπηρεσίες ανώνυμα. Επιλέξτε κάτω για να επισκεφτείτε τη σελίδα του Onion DuckDuckGo. +onboarding.tour-tor-onion-services.description=Οι υπηρεσίες του Onion είναι ιστοσελίδες που τελειώνουν σε .onion και παρέχουν επιπλέον προστασία στους δημοσιευτές και τους επισκέπτες, συμπεριλαμβανομένων και μέτρων ασφάλειας ενάντια στη λογοκρισία. Οι υπηρεσίες του Onion επιτρέπουν στον καθένα να παράσχει υλικά και υπηρεσίες ανώνυμα. Επιλέξτε κάτω για να επισκεφτείτε τη σελίδα του Onion DuckDuckGo. onboarding.tour-tor-onion-services.button=Επισκεφτείτε ένα Onion # Circuit Display onboarding. @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Τα κυκλώματα δημιουρ onboarding.tor-circuit-display.diagram.title=Προεπισκόπηση κυκλώματος onboarding.tor-circuit-display.diagram.msg=Αυτό το διάγραμμα δείχνει τις συνδέσεις που αποτελούν το κύκλωμα για αυτήν την ιστοσελίδα. Για να αποφύγετε τη σύνδεση της δραστηριότητας από σελίδα σε σελίδα, κάθε ιστοσελίδα παίρνει διαφορετικό κύκλωμα. -onboarding.tor-circuit-display.new-circuit.title=Χρειάζεσαι καινούριο κύκλωμα; +onboarding.tor-circuit-display.new-circuit.title=Χρειάζεστε καινούριο κύκλωμα; onboarding.tor-circuit-display.new-circuit.msg=Αν δεν μπορείτε να συνδεθείτε στην ιστοσελίδα που προσπαθείτε να συνδεθείτε ή αν δεν φορτώνει σωστά, τότε μπορείτε να χρησιμοποιήσετε αυτό το κουμπί για να ανανεώσετε τη σελίδα με νέο κύκλωμα. diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index a6d1ec4b..f67c4434 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -16,4 +16,4 @@ <!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  <!ENTITY bottomLinks.license "Informations de licence"> -<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »"> +<!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques de commerce de « The Tor Project, Inc. »"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index f373d753..959842c6 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -20,7 +20,7 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> <!ENTITY aboutTor.torbrowser_user_manual.label "Guide d’utilisation du Navigateur Tor"> -<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies d’anonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> +<!ENTITY aboutTor.tor_mission.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) qui fait progresser les droits de la personne et les libertés en créant et en déployant des technologies d’anonymat et de confidentialité gratuites et à code source ouvert. Nous soutenons leur disponibilité et leur utilisation sans restriction, et promouvons une meilleure compréhension scientifique et populaire."> <!ENTITY aboutTor.getInvolved.label "Impliquez-vous »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html"> diff --git a/src/chrome/locale/fr/brand.dtd b/src/chrome/locale/fr/brand.dtd index b3fe3f1c..a55f3014 100644 --- a/src/chrome/locale/fr/brand.dtd +++ b/src/chrome/locale/fr/brand.dtd @@ -6,7 +6,7 @@ <!ENTITY brandShortName "Navigateur Tor"> <!ENTITY brandFullName "Navigateur Tor"> <!ENTITY vendorShortName "Projet Tor"> -<!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques déposées de la Fondation Mozilla."> +<!ENTITY trademarkInfo.part1 "Firefox et les logos de Firefox sont des marques de commerce de la Fondation Mozilla.">  <!ENTITY plugins.installed.find "Cliquer pour charger les greffons système installés"> diff --git a/src/chrome/locale/ja/aboutTBUpdate.dtd b/src/chrome/locale/ja/aboutTBUpdate.dtd index 4ded2bf7..8be08aa4 100644 --- a/src/chrome/locale/ja/aboutTBUpdate.dtd +++ b/src/chrome/locale/ja/aboutTBUpdate.dtd @@ -7,4 +7,4 @@ <!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> <!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.learnMore "さらに詳しく"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 8c573564..19a54e77 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -6,19 +6,19 @@ <!ENTITY aboutTor.title "Torについて"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "探索する。プライベートに。"> +<!ENTITY aboutTor.ready2.label "世界で最もプライベートなブラウジングを体験する準備が整いました。"> <!ENTITY aboutTor.failure.label "何かが間違っています！"> <!ENTITY aboutTor.failure2.label "Torは、このブラウザでは動作しません。"> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "DuckDuckGoで検索"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "質問がありますか？"> <!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser マニュアル"> <!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> <!ENTITY aboutTor.getInvolved.label "Get Involved »"> @@ -31,12 +31,12 @@ <!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> <!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> +<!ENTITY aboutTor.donationBanner.line2c "自由のために立ち上がる。"> <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2f "我々にはあなたのサポートが必要です!"> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> +<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties index 2261c993..e3f09909 100644 --- a/src/chrome/locale/ja/browserOnboarding.properties +++ b/src/chrome/locale/ja/browserOnboarding.properties @@ -5,14 +5,14 @@ onboarding.tour-tor-welcome=ようこそ onboarding.tour-tor-welcome.title=You’re ready. onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome.button=今すぐ開始 onboarding.tour-tor-privacy=プライバシー onboarding.tour-tor-privacy.title=Snub trackers and snoopers. onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Go to Tor Network -onboarding.tour-tor-network=Tor Network +onboarding.tour-tor-network=Torネットワーク onboarding.tour-tor-network.title=Travel a decentralized network. onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display @@ -30,7 +30,7 @@ onboarding.tour-tor-security.button=Review Settings onboarding.tour-tor-expect-differences=Experience Tips onboarding.tour-tor-expect-differences.title=Expect some differences. onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences.button=よくある質問を見る onboarding.tour-tor-onion-services=Onion Services onboarding.tour-tor-onion-services.title=Be extra protected. @@ -50,5 +50,5 @@ onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assign onboarding.tor-circuit-display.diagram.title=Circuit Display onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? +onboarding.tor-circuit-display.new-circuit.title=新しいサーキットが必要ですか? onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. diff --git a/src/chrome/locale/ka/torbutton.properties b/src/chrome/locale/ka/torbutton.properties index 21d96e32..cbe0d8b0 100644 --- a/src/chrome/locale/ka/torbutton.properties +++ b/src/chrome/locale/ka/torbutton.properties @@ -24,7 +24,7 @@ torbutton.popup.dontask = ავტომატურად ჩამოიტ torbutton.popup.no_newnym = Torbutton ვერ ახერხებს ახალი ვინაობის უსაფრთხოდ მონიჭებას. წვდომა არ აქვს წვდომა Tor-ის მართვის პორტთან.\n\nAre you running Tor Browser Bundle? torbutton.security_settings.menu.title = უსაფრთხოების პარამეტრები torbutton.title.prompt_torbrowser = მნიშვნელოვანი ინფორმაცია Torbutton-ის შესახებ -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. +torbutton.popup.prompt_torbrowser = Torbutton ახლა უკვე სხვანაირად მუშაობს: მისი გამორთვა აღარ შეგიძლიათ.\n\nეს ცვლილება იმიტომ გავაკეთეთ, რომ არაა უსაფრთხო Torbutton-ის იმ ბრაუზერში გამოყენება, რომელიც Tor-ის გარეშეც მუშაობს. ამ ყველაფერს უამრავი ხარვეზი ახლავს თან, რომელთა მოგვარებაც სხვა გზით ვერ მოვახერხებთ.\n\nთუ გსურთ განაგრძოთ Firefox-ის ჩვეულებრივ გამოყენება, უნდა ამოშალოთ Torbutton და ჩამოტვირთოთ Tor-ბრაუზერის კრებ ული. პირადი მონაცემების დაცვის შესაძლებლობები გაცილებით უკეთესია Tor-ბრაუზერში, ვიდრე ჩვეულებრივ Firefox-ში, მისი Torbutton-თან ერთად გამოყენების შემთხვევაშიც კი.\n\nTorbutton-ის წასაშლელად, გადადით ხელსაწყოები->დამატებები->გაფართოებები და შემდეგ დააწკაპეთ ამოშლის ღილაკს Torbutton-ის გვერდით. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. torbutton.popup.confirm_plugins = მოდულობს, როგორიცაა Flash შეუძლია საფრთხის ქვეშ დააყენოს თქვენი პირადი მონაცემები და ვინაობის გაუმხელობა.\n\nმათი საშუალებით, შესაძლებელია Tor-ის გვერდის ავლით დადგინდეს თქვენი მდებარეობა და IP-მისამართი.\n\nნამდვილად გსურთ მოდულების ჩართვა?\n\n diff --git a/src/chrome/locale/sv/aboutTBUpdate.dtd b/src/chrome/locale/sv/aboutTBUpdate.dtd index 02a58303..7b757280 100644 --- a/src/chrome/locale/sv/aboutTBUpdate.dtd +++ b/src/chrome/locale/sv/aboutTBUpdate.dtd @@ -5,6 +5,6 @@ <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Ändringslogg:"> -<!ENTITY aboutTBUpdate.circuitDisplayHeading "New, Redesigned Circuit Display"> -<!ENTITY aboutTBUpdate.circuitDisplayDescription "The Tor circuit display has been relocated and improved! Click the Site Identity button (located on the left side of the URL bar) to see the new circuit display."> -<!ENTITY aboutTBUpdate.learnMore "Learn More"> +<!ENTITY aboutTBUpdate.circuitDisplayHeading "Ny, omformad kretsrutan"> +<!ENTITY aboutTBUpdate.circuitDisplayDescription "Tor-kretsrutan har flyttats och förbättrats! Klicka på webbplatsen Identitetsknapp (ligger på vänster sida av webbadressfältet) för att se den nya kretsrutan."> +<!ENTITY aboutTBUpdate.learnMore "Läs mer"> diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 94cea14a..76dcfa01 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -6,37 +6,37 @@ <!ENTITY aboutTor.title "Om Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Utforska. Privat."> +<!ENTITY aboutTor.ready2.label "Du är redo för världens mest privata surfupplevelse."> <!ENTITY aboutTor.failure.label "Någonting gick fel!"> <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Sök med DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Kolla in bruksanvisning för Tor-webbläsaren »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Bruksanvisning för Tor-webbläsaren"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "Tor-projektet är en amerikansk 501(c)(3) ideell organisation som främjar mänskliga rättigheter och friheter genom att skapa och distribuera anonymitets- och sekretessteknik med fri och öppen källkod, stödja deras obegränsade tillgänglighet och användning och främja deras vetenskapliga och populära förståelse."> +<!ENTITY aboutTor.getInvolved.label "Engagera dig »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> -<!ENTITY aboutTor.newsletter.link_text "Sign up for Tor News."> +<!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> +<!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Styrka i antal"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2a "Anonymitet älskar sällskap."> +<!ENTITY aboutTor.donationBanner.line2b "Främja universella mänskliga rättigheter."> +<!ENTITY aboutTor.donationBanner.line2c "Stå upp för frihet."> +<!ENTITY aboutTor.donationBanner.line2d "Skydda miljontals privatliv."> +<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> +<!ENTITY aboutTor.donationBanner.line2f "Vi behöver ert stöd!"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "Ge idag, och Mozilla kommer att matcha din donation."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> +<!ENTITY aboutTor.donationBanner.buttonB "Räkna med mig"> diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties index 847225d6..779564db 100644 --- a/src/chrome/locale/sv/browserOnboarding.properties +++ b/src/chrome/locale/sv/browserOnboarding.properties @@ -2,53 +2,53 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -onboarding.tour-tor-welcome=Welcome -onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. -onboarding.tour-tor-welcome.button=Start Now +onboarding.tour-tor-welcome=Välkommen +onboarding.tour-tor-welcome.title=Du är redo. +onboarding.tour-tor-welcome.description=Tor-webbläsaren erbjuder högsta standard för integritet och säkerhet när du surfar på webben. Du är nu skyddad mot spårning, övervakning och censur. Denna snabba introduktion kommer att visa dig hur. +onboarding.tour-tor-welcome.button=Börja nu onboarding.tour-tor-privacy=Sekretess -onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. -onboarding.tour-tor-privacy.button=Go to Tor Network +onboarding.tour-tor-privacy.title=Avvisa bevakare och snokare. +onboarding.tour-tor-privacy.description=Tor-webbläsaren isolerar kakor och tar bort din webbläsarhistorik efter din session. Dessa ändringar säkerställa din integritet och säkerhet skyddas i webbläsaren. Klicka på "Tor-nätverk" för att lära dig hur vi skyddar dig på nätverksnivå. +onboarding.tour-tor-privacy.button=Gå till Tor-nätverket -onboarding.tour-tor-network=Tor Network -onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. -onboarding.tour-tor-network.button=Go to Circuit Display +onboarding.tour-tor-network=Tor-nätverk +onboarding.tour-tor-network.title=Res ett decentraliserat nätverk. +onboarding.tour-tor-network.description=Tor-webbläsaren ansluter dig till Tor-nätverket som drivs av tusentals volontärer runt om i världen. Till skillnad från en VPN, det finns ingen punkt av misslyckande eller centraliserad enhet du behöver lita på för att njuta av internet privat. +onboarding.tour-tor-network.button=Gå till kretsvisning -onboarding.tour-tor-circuit-display=Circuit Display -onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. -onboarding.tour-tor-circuit-display.button=See My Path +onboarding.tour-tor-circuit-display=Kretsvisning +onboarding.tour-tor-circuit-display.title=Se din väg. +onboarding.tour-tor-circuit-display.description=För varje domän du besöker förmedlas din trafik och krypteras i en krets över tre tor-reläer runt om i världen. Ingen webbplats vet var du ansluter från. Du kan begära en ny krets genom att klicka på "ny krets för denna webbplats" på vår kretsvisning. +onboarding.tour-tor-circuit-display.button=Se Min väg onboarding.tour-tor-security=Säkerhet -onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. -onboarding.tour-tor-security.button=Review Settings +onboarding.tour-tor-security.title=Välj din upplevelse. +onboarding.tour-tor-security.description=Vi ger dig också ytterligare inställningar för att stöta upp din webbläsares säkerhet. Våra säkerhetsinställningar kan du blockera element som kan användas för att attackera din dator. Klicka nedan för att se vad de olika alternativen gör. +onboarding.tour-tor-security.button=Granska Inställningar -onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Expect some differences. -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. -onboarding.tour-tor-expect-differences.button=See FAQs +onboarding.tour-tor-expect-differences=Erfarenhets tips +onboarding.tour-tor-expect-differences.title=Förvänta dig vissa skillnader. +onboarding.tour-tor-expect-differences.description=Med alla säkerhets- och sekretessfunktioner som Tor tillhandahåller kan din upplevelse när du surfar på internet vara lite annorlunda. Saker kan vara lite långsammare, och beroende på din säkerhetsnivå, vissa element kanske inte fungerar eller ladda. Du kan också bli ombedd att bevisa att du är en människa och inte en robot. +onboarding.tour-tor-expect-differences.button=Se Vanliga frågor onboarding.tour-tor-onion-services=Onion tjänster -onboarding.tour-tor-onion-services.title=Be extra protected. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.title=Var extra skyddad. +onboarding.tour-tor-onion-services.description=Onion-tjänster är webbplatser som slutar med en .onion som ger extra skydd till utgivare och besökare, inklusive extra garantier mot censur. Onion-tjänster tillåter alla att tillhandahålla innehåll och tjänster anonymt. Klicka nedan för att besöka DuckDuckGo-onion webbplatsen. +onboarding.tour-tor-onion-services.button=Besök en Onion # Circuit Display onboarding. onboarding.tor-circuit-display.next=Nästa onboarding.tor-circuit-display.done=Färdig -onboarding.tor-circuit-display.one-of-three=1 of 3 -onboarding.tor-circuit-display.two-of-three=2 of 3 -onboarding.tor-circuit-display.three-of-three=3 of 3 +onboarding.tor-circuit-display.one-of-three=1 av 3 +onboarding.tor-circuit-display.two-of-three=2 av 3 +onboarding.tor-circuit-display.three-of-three=3 av 3 -onboarding.tor-circuit-display.intro.title=How do circuits work? -onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly assigned relays, which are computers around the world configured to forward Tor traffic. Circuits allow you to browse privately and to connect to onion services. +onboarding.tor-circuit-display.intro.title=Hur fungerar kretsar? +onboarding.tor-circuit-display.intro.msg=Kretsar består av slumpmässigt tilldelade reläer, som är datorer runt om i världen konfigurerade för att vidarebefordra Tor-trafik. Kretsar kan du bläddra privat och ansluta till onion-tjänster. -onboarding.tor-circuit-display.diagram.title=Circuit Display -onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that make up the circuit for this website. To prevent linking of activity across different sites, each website gets a different circuit. +onboarding.tor-circuit-display.diagram.title=Kretsvisning +onboarding.tor-circuit-display.diagram.msg=Detta diagram visar reläer som utgör kretsen för denna webbplats. För att förhindra länkning av aktivitet över olika platser, varje webbplats får en annan krets. -onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit? -onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect to the website you’re trying to visit or it is not loading properly, then you can use this button to reload the site with a new circuit. +onboarding.tor-circuit-display.new-circuit.title=Behöver du en ny krets? +onboarding.tor-circuit-display.new-circuit.msg=Om du inte kan ansluta till webbplatsen du försöker besöka eller det inte laddas ordentligt, kan du använda den här knappen för att ladda om webbplatsen med en ny krets. diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 5069c79e..83f5eee7 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -51,5 +51,5 @@ profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen änd profileMigrationFailed=Migrering av din befintliga %S profil misslyckades.\nNya inställningar kommer att användas. # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) -pageInfo_OnionEncryption=Connection Encrypted (Onion Service) +pageInfo_OnionEncryptionWithBitsAndProtocol=Anslutning krypterad (Onion-tjänst, %1$S, %2$S bit nycklar, %3$S) +pageInfo_OnionEncryption=Anslutning krypterad (Onion-tjänst) diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties index 219f3037..1b10fd9a 100644 --- a/src/chrome/locale/tr/browserOnboarding.properties +++ b/src/chrome/locale/tr/browserOnboarding.properties @@ -9,7 +9,7 @@ onboarding.tour-tor-welcome.button=Başlayın onboarding.tour-tor-privacy=Kişisel Gizlilik onboarding.tour-tor-privacy.title=İzleyenlere ve meraklılara hadlerini bildirin. -onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattıığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağo' üzerine tıklayın. +onboarding.tour-tor-privacy.description=Tor Browser çerezleri yalıtır ve kapattığınızda web tarayıcı geçmişinizi siler. Bu değişiklikler web tarayıcı üzerinde kişisel gizliliğinizin ve güvenliğinizin korunmasını sağlar. Ağ düzeyinde nasıl koruma sağladığımızı öğrenmek için 'Tor Ağı' üzerine tıklayın. onboarding.tour-tor-privacy.button=Tor Ağına Geç onboarding.tour-tor-network=Tor Ağı diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index e349d913..358a958a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -42,7 +42,7 @@ <!ENTITY torbutton.prefs.sec_safest_description "Yalnız durağan siteler ve temel hizmetler için gerekli web sitesi özelliklerine izin verilir. Bu değişiklikler görselleri, ortamları ve betikleri etkiler."> <!ENTITY torbutton.prefs.sec_safest_list_label "En güvenli ayarlar kullanıldığında:"> <!ENTITY torbutton.prefs.sec_learn_more_label "Ayrıntılı bilgi alın"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript,,HTTPS kullanmayan sitelerde devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript, HTTPS kullanmayan sitelerde devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript betikleri tüm sitelerde varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_typography "Bazı yazı türleri ve matematik simgeleri devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Bazı yazı türleri, simgeler, matematik simgeleri ve görseller devre dışı bırakılır."> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 502cbb8c..f61e2a91 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -27,16 +27,16 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor：众人拾柴火焰高"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2a "匿名的表示对公司的爱意。"> +<!ENTITY aboutTor.donationBanner.line2b "推进基本人权。"> +<!ENTITY aboutTor.donationBanner.line2c "为自由呐喊。"> +<!ENTITY aboutTor.donationBanner.line2d "保护数百万人的隐私。"> +<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> +<!ENTITY aboutTor.donationBanner.line2f "我们需要你的帮助！"> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3 "现在捐款， Mozilla 也能从你的捐赠中受益。"> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> +<!ENTITY aboutTor.donationBanner.buttonB "算我一个">

1 0

[torbutton/master] Bug 25013: Make `en` a symlink of `en-US` instead
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 152a94d5779076525da8a420641ff82b6d85d6de Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 13:14:25 2018 +0000 Bug 25013: Make `en` a symlink of `en-US` instead --- src/chrome/locale/en | 1 + src/chrome/locale/en-US | 1 - src/chrome/locale/{en => en-US}/aboutDialog.dtd | 0 src/chrome/locale/{en => en-US}/aboutTBUpdate.dtd | 0 src/chrome/locale/{en => en-US}/aboutTor.dtd | 0 src/chrome/locale/{en => en-US}/brand.dtd | 0 src/chrome/locale/{en => en-US}/brand.properties | 0 src/chrome/locale/{en => en-US}/browserOnboarding.properties | 0 src/chrome/locale/{en => en-US}/torbutton.dtd | 0 src/chrome/locale/{en => en-US}/torbutton.properties | 0 10 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en b/src/chrome/locale/en new file mode 120000 index 00000000..f2b0341f --- /dev/null +++ b/src/chrome/locale/en @@ -0,0 +1 @@ +en-US \ No newline at end of file diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US deleted file mode 120000 index 2c4c454f..00000000 --- a/src/chrome/locale/en-US +++ /dev/null @@ -1 +0,0 @@ -en \ No newline at end of file diff --git a/src/chrome/locale/en/aboutDialog.dtd b/src/chrome/locale/en-US/aboutDialog.dtd similarity index 100% rename from src/chrome/locale/en/aboutDialog.dtd rename to src/chrome/locale/en-US/aboutDialog.dtd diff --git a/src/chrome/locale/en/aboutTBUpdate.dtd b/src/chrome/locale/en-US/aboutTBUpdate.dtd similarity index 100% rename from src/chrome/locale/en/aboutTBUpdate.dtd rename to src/chrome/locale/en-US/aboutTBUpdate.dtd diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd similarity index 100% rename from src/chrome/locale/en/aboutTor.dtd rename to src/chrome/locale/en-US/aboutTor.dtd diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en-US/brand.dtd similarity index 100% rename from src/chrome/locale/en/brand.dtd rename to src/chrome/locale/en-US/brand.dtd diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en-US/brand.properties similarity index 100% rename from src/chrome/locale/en/brand.properties rename to src/chrome/locale/en-US/brand.properties diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties similarity index 100% rename from src/chrome/locale/en/browserOnboarding.properties rename to src/chrome/locale/en-US/browserOnboarding.properties diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd similarity index 100% rename from src/chrome/locale/en/torbutton.dtd rename to src/chrome/locale/en-US/torbutton.dtd diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en-US/torbutton.properties similarity index 100% rename from src/chrome/locale/en/torbutton.properties rename to src/chrome/locale/en-US/torbutton.properties

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit e00084a6a67ba6ab0c504421ed13a49765dc83d2 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Nov 6 15:47:31 2018 -0800 Bug 26540: Enabling pdfjs disableRange option prevents pdfs from loading Large pdf files download in parts via range-based requests so that users can begin reading before the entire file has finished downloading. This is implemented using XMLHttpRequests. However, since these requests are created in the chrome, they are given the System Principal and lack the correct firstPartyDomain associated with the parent window. This patch manually sets the XMLHttpRequest's originAttributes to the one provided by the real owning window cached in the RangedChromeActions object. This is done via the chrome-only setOriginAttributes method. The method is called in the xhr_onreadystatechanged() callback rather than directly after construction in getXhr() because the setOriginAttributes implementation requires the internal nsIChannel object to have been created but not used. Fortunately, the XMLHttpRequest object fires the readStateChangedEvent precisely after the channel has been created in the XmlHttpRequest's Open() method. The nsIChannel's nsILoadInfo's OriginAttributes are now overwritten with the known OriginAttributes of the parent window before anything else has had a chance to use it. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index a2ebec9450d4..a9978f7e7863 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -233,6 +233,15 @@ class ChromeActions { return PrivateBrowsingUtils.isContentWindowPrivate(this.domWindow); } + getWindowOriginAttributes() + { + try { + return this.domWindow.document.nodePrincipal.originAttributes; + } catch(err) { + return {}; + } + } + download(data, sendResponse) { var self = this; var originalUrl = data.originalUrl; @@ -591,6 +600,9 @@ class RangedChromeActions extends ChromeActions { var self = this; var xhr_onreadystatechange = function xhr_onreadystatechange() { if (this.readyState === 1) { // LOADING + // override this XMLHttpRequest's OriginAttributes with our cached parent window's + // OriginAttributes, as we are currently running under the SystemPrincipal + this.setOriginAttributes(self.getWindowOriginAttributes()); var netChannel = this.channel; if ("nsIPrivateBrowsingChannel" in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) {

1 0

[torbutton/master] bug 25013: Remove non needed import, it is already available in the window object
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 9c2adcecd64ab6a390e305509fbe77d1acb9ea90 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Oct 22 07:56:35 2018 -0200 bug 25013: Remove non needed import, it is already available in the window object --- src/chrome/content/torbutton.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index fc1a38d8..90da5827 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,8 +13,6 @@ let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", { let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); -Cu.importGlobalProperties(["XMLHttpRequest"]); - const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck";

1 0

[torbutton/master] bug 25013: Create symlink to en locale folder following mozilla standard naming
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 78d26b12542bc8b05c3624f0ce17096d0e6cb5db Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Nov 12 02:12:53 2018 -0200 bug 25013: Create symlink to en locale folder following mozilla standard naming Additionally, remove it when using the makexpi to create a xpi package. XPI packages are using the chrome.manifest and they support multi lang bundle. --- makexpi.sh | 4 ++-- src/chrome/locale/en-US | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makexpi.sh b/makexpi.sh index 243fbd6b..aa3e665b 100755 --- a/makexpi.sh +++ b/makexpi.sh @@ -20,8 +20,8 @@ echo ---------- create $APP_NAME.xpi ---------- # create the pkg directory if it doesn't exist yet mkdir -p pkg cd src -echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" #-x "chrome/*" +echo zip -X -9r ../pkg/$XPI_NAME ./ -x "chrome/*" -x "*.diff" -x "*.svn/*" -x "chrome/locale/en-US/*" +zip -X -9r ../pkg/$XPI_NAME ./ -x "*.svn/*" -x "*.diff" -x "chrome/locale/en-US/*" #-x "chrome/*" #mv ../$APP_NAME.jar ./chrome #zip -9m ../pkg/$XPI_NAME chrome/$APP_NAME.jar cd .. diff --git a/src/chrome/locale/en-US b/src/chrome/locale/en-US new file mode 120000 index 00000000..2c4c454f --- /dev/null +++ b/src/chrome/locale/en-US @@ -0,0 +1 @@ +en \ No newline at end of file

1 0

[torbutton/master] Merge remote-tracking branch 'igt0/25013-v4'
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 831c8bee11a464b42dcee9c84ad52fca07e5e241 Merge: 923fd850 78d26b12 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 12 11:21:30 2018 +0000 Merge remote-tracking branch 'igt0/25013-v4' makexpi.sh | 4 +-- moz.build | 12 ++++++++ src/chrome/content/torbutton.js | 2 -- src/chrome/locale/en-US | 1 + src/jar.mn | 68 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 4 deletions(-)

1 0

[torbutton/master] bug 25013: Add Gecko build system infrastructure into tor button
by gk＠torproject.org 12 Nov '18

12 Nov '18

commit 5f10327ae16666ff4beb64a206a64a7760898b01 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Oct 22 07:56:04 2018 -0200 bug 25013: Add Gecko build system infrastructure into tor button --- moz.build | 12 +++++++++++ src/jar.mn | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/moz.build b/moz.build new file mode 100644 index 00000000..5e067c98 --- /dev/null +++ b/moz.build @@ -0,0 +1,12 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +JAR_MANIFESTS += ['src/jar.mn'] +JS_PREFERENCE_FILES += [ + 'src/defaults/preferences/preferences.js', +] +FINAL_TARGET_FILES.features['torbutton(a)torproject.org'] += [ + 'src/install.rdf' +] diff --git a/src/jar.mn b/src/jar.mn new file mode 100644 index 00000000..142a5773 --- /dev/null +++ b/src/jar.mn @@ -0,0 +1,68 @@ +#filter substitution + +torbutton.jar: + +% content torbutton %content/ + + content/ (chrome/content/*) + components/ (components/*) + defaults/ (defaults/*) + modules/ (modules/*) + skin/ (chrome/skin/*) + +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/torbutton.xul +% overlay chrome://browser/content/preferences/connection.xul chrome://torbutton/content/pref-connection.xul +% overlay chrome://messenger/content/messenger.xul chrome://torbutton/content/torbutton_tb.xul +% overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://torbutton/content/torbutton_tb.xul +% overlay about:addons chrome://torbutton/content/torbutton-extensions.xul +% overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul +% resource torbutton % +% resource torbutton-assets resource://torbutton/skin/ contentaccessible=yes + +# browser branding +% override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd +% override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties +% overlay chrome://browser/content/aboutDialog.xul chrome://torbutton/content/aboutDialog.xul + +# UI customization +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-items-overlay.xul +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/menu-overlay.xul +% overlay about:preferences chrome://torbutton/content/privacy-prefs-overlay.xul +% overlay chrome://browser/content/browser.xul chrome://torbutton/content/tor-circuit-display.xul + +# Strings for the about:tbupdate page +% override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd + +% locale torbutton @AB_CD@ %locale/@AB_CD@/ + locale/@AB_CD@/ (chrome/locale/@AB_CD@/*) + +% skin torbutton classic/1.0 %skin/ +% style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css + +# Firefox 4-style component registration +% component {f605ec27-d867-44b5-ad97-2a29276642c3} %components/dragDropFilter.js +% contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} + +% component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} %components/external-app-blocker.js +% contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} + +% component {06322def-6fde-4c06-aef6-47ae8e799629} %components/startup-observer.js +% contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} + +% component {e6204253-b690-4159-bfe8-d4eedab6b3be} %components/cookie-jar-selector.js +% contract @torproject.org/cookie-jar-selector;1 {e6204253-b690-4159-bfe8-d4eedab6b3be} + +% component {5d57312b-5d8c-4169-b4af-e80d6a28a72e} %components/torCheckService.js +% contract @torproject.org/torbutton-torCheckService;1 {5d57312b-5d8c-4169-b4af-e80d6a28a72e} + +% component {f36d72c9-9718-4134-b550-e109638331d7} %components/torbutton-logger.js +% contract @torproject.org/torbutton-logger;1 {f36d72c9-9718-4134-b550-e109638331d7} + +% component {e33fd6d4-270f-475f-a96f-ff3140279f68} %components/domain-isolator.js +% contract @torproject.org/domain-isolator;1 {e33fd6d4-270f-475f-a96f-ff3140279f68} + +% category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selector;1 + +% category profile-after-change StartupObserver @torproject.org/startup-observer;1 +% category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 +% category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1

1 0

[tor-browser-build/master] Bug 28260: Use Rust 1.28.0 to build Tor
by gk＠torproject.org 11 Nov '18

11 Nov '18

commit 0a633e6289822f316b838b32fe0135d5b7c9967d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 31 11:04:03 2018 +0100 Bug 28260: Use Rust 1.28.0 to build Tor As rbm currently does not do deep merge of options hashes (bug 26185) we cannot modify var/* options from the input_files section (or we lose all the other var/* options). As a workaround we move the two options we need to modify under input_file_var/ instead of var/. --- projects/rust/build | 4 ++-- projects/rust/config | 11 +++++++++-- projects/tor/config | 5 +++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/projects/rust/build b/projects/rust/build index 5f421c7..7ae3073 100644 --- a/projects/rust/build +++ b/projects/rust/build @@ -2,7 +2,7 @@ [% c('var/setarch') %] [% c("var/set_default_env") -%] distdir=/var/tmp/dist/[% project %] -mkdir -p /var/tmp/dist +mkdir -p $distdir tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] export PATH="/var/tmp/dist/cmake/bin:$PATH" tar -C /var/tmp/dist -xf [% c('input_files_by_name/prev_rust') %] @@ -32,7 +32,7 @@ export PATH="$distdir-rust-old/bin:$PATH" done cd .. ln -s x86_64-apple-darwin11 x86_64-apple-darwin - mkdir -p $distdir/helper + mkdir $distdir/helper # We need to adapt our CFLAGS and make sure our flags are passed down to all # dependencies. Using `CFLAGS_x86_apple-darwin` did not do the trick, so resort diff --git a/projects/rust/config b/projects/rust/config index d3f9c40..83ae690 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -1,8 +1,15 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -version: 1.26.1 -var: +version: '[% c("input_file_var/rust_version") %]' + +# those values can be changed from the input_files section of other +# projects. See projects/tor/config and bug 28260. +input_file_var: + rust_version: 1.26.1 prev_version: 1.25.0 + +var: + prev_version: '[% c("input_file_var/prev_version") %]' rust_arch: '[% c("arch") %]' container: use_container: 1 diff --git a/projects/tor/config b/projects/tor/config index bb743ca..cc6df23 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -60,4 +60,9 @@ input_files: project: '[% c("var/compiler") %]' - name: rust project: rust + # Tor needs rust >= 1.28.0 + # See bug 28260 + input_file_var: + rust_version: 1.28.0 + prev_version: 1.27.2 enable: '[% c("var/linux") && c("var/nightly") %]'

1 0

[torbutton/master] Bug 28039: Enable dump() if log method is 0
by gk＠torproject.org 09 Nov '18

09 Nov '18

commit 923fd8500a16b0a343450621a62ea10175c38b3d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 22 11:37:19 2018 +0000 Bug 28039: Enable dump() if log method is 0 Without setting `browser.dom.window.dump.enabled` explicitly to `true` it is not possible anymore to capture output in the terminal when the log method is set to 0. We make sure that `browser.dom.window.dump.enabled` is set to `true` in that case and disable it again otherwise, unless Tor Launcher has enabled logging in a terminal as well. For context see: https://bugzilla.mozilla.org/show_bug.cgi?id=379797 https://bugzilla.mozilla.org/show_bug.cgi?id=1395711 --- src/components/torbutton-logger.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/torbutton-logger.js b/src/components/torbutton-logger.js index b25d039b..fdf7bb7d 100644 --- a/src/components/torbutton-logger.js +++ b/src/components/torbutton-logger.js @@ -154,6 +154,16 @@ TorbuttonLogger.prototype = switch (data) { case "extensions.torbutton.logmethod": this.logmethod = Services.prefs.getIntPref("extensions.torbutton.logmethod"); + if (this.logmethod === 0) { + Services.prefs.setBoolPref("browser.dom.window.dump.enabled", + true); + } else if (Services.prefs. + getIntPref("extensions.torlauncher.logmethod", 3) !== 0) { + // If Tor Launcher is not available or its log method is not 0 + // then let's reset the dump pref. + Services.prefs.setBoolPref("browser.dom.window.dump.enabled", + false); + } break; case "extensions.torbutton.loglevel": this.loglevel = Services.prefs.getIntPref("extensions.torbutton.loglevel");

1 0

[tor-launcher/master] Bug 28039: Enable dump() if log method is 0
by gk＠torproject.org 09 Nov '18

09 Nov '18

commit 80749f18beb93f94cb6be9a5e2c17438ff133ab8 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 22 11:40:28 2018 +0000 Bug 28039: Enable dump() if log method is 0 Without setting `browser.dom.window.dump.enabled` explicitly to `true` it is not possible anymore to capture output in the terminal when the log method is set to 0. We make sure that `browser.dom.window.dump.enabled` is set to `true` in that case and disable it again otherwise, unless Torbutton has enabled logging in a terminal as well. For context see: https://bugzilla.mozilla.org/show_bug.cgi?id=379797 https://bugzilla.mozilla.org/show_bug.cgi?id=1395711 --- src/modules/tl-logger.jsm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/tl-logger.jsm b/src/modules/tl-logger.jsm index a2ea404..551ad92 100644 --- a/src/modules/tl-logger.jsm +++ b/src/modules/tl-logger.jsm @@ -151,6 +151,14 @@ let TLLoggerInternal = // Private case "extensions.torlauncher.logmethod": this.mLogMethod = TorLauncherUtil.getIntPref( "extensions.torlauncher.logmethod"); + if (this.mLogMethod === 0) { + TorLauncherUtil.setBoolPref("browser.dom.window.dump.enabled", true); + } else if (TorLauncherUtil. + getIntPref("extensions.torbutton.logmethod", 3) !== 0) { + // If Torbutton is not available or its log method is not 0 + // then let's reset the dump pref. + TorLauncherUtil.setBoolPref("browser.dom.window.dump.enabled", false); + } break; case "extensions.torlauncher.loglevel": this.mLogLevel = TorLauncherUtil.getIntPref(

1 0

[tor-browser-build/maint-8.0] Cleaning up HTTPS-Everywhere keys
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit 7daa78893b9b6a2034617233a0bb85c272d07fa1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 8 18:33:53 2018 +0000 Cleaning up HTTPS-Everywhere keys Adding Alexis' and keeping only Bill's in addition to that --- keyring/https-everywhere.gpg | Bin 203297 -> 13943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index f6a9dfc..98b0ec6 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[tor-browser-build/master] Cleaning up HTTPS-Everywhere keys
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit ee32f3ea93954ab5d13cdcf333a1f85aa3dca02a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 8 18:33:53 2018 +0000 Cleaning up HTTPS-Everywhere keys Adding Alexis' and keeping only Bill's in addition to that --- keyring/https-everywhere.gpg | Bin 203297 -> 13943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index f6a9dfc..98b0ec6 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[torbutton/master] Bug 28187: Change tor circuit icon to torbutton.svg
by gk＠torproject.org 08 Nov '18

08 Nov '18

commit 6a9a4f528d8b8254402802a7a86cd722b747a5a6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Nov 2 10:03:35 2018 -0700 Bug 28187: Change tor circuit icon to torbutton.svg Also, introduce a "new circuit" icon (designed by Antonela Debiasi) to hamburger menu. --- src/chrome/content/menu-items-overlay.xul | 2 ++ src/chrome/skin/new_circuit.svg | 8 ++++++++ src/chrome/skin/relay.svg | 10 ---------- src/chrome/skin/tor-circuit-display.css | 6 +++--- src/chrome/skin/torbutton.css | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/menu-items-overlay.xul b/src/chrome/content/menu-items-overlay.xul index 274c9c71..b2e862b3 100644 --- a/src/chrome/content/menu-items-overlay.xul +++ b/src/chrome/content/menu-items-overlay.xul @@ -15,10 +15,12 @@ label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> <toolbarbutton id="appMenuNewIdentity" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-identity-key" label="&torbutton.context_menu.new_identity;" oncommand="torbutton_new_identity();"/> <toolbarbutton id="appMenuNewCircuit" + class="subviewbutton subviewbutton-iconic" key="torbutton-new-circuit-key" label="&torbutton.context_menu.new_circuit;" oncommand="torbutton_new_circuit();"/> diff --git a/src/chrome/skin/new_circuit.svg b/src/chrome/skin/new_circuit.svg new file mode 100644 index 00000000..e0a93cc8 --- /dev/null +++ b/src/chrome/skin/new_circuit.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Icon / New Circuit(a)1.5x</title> + <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> +</svg> diff --git a/src/chrome/skin/relay.svg b/src/chrome/skin/relay.svg deleted file mode 100644 index b2f5f16c..00000000 --- a/src/chrome/skin/relay.svg +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> -  - <title>relay</title> - <desc>Created with Sketch.</desc> - <defs></defs> - <g id="Artboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" transform="translate(-448.000000, -65.000000)"> - <path d="M462.904942,71.0268217 L467.575247,74.1403583 C468.095041,73.9073638 468.671277,73.7777778 469.277778,73.7777778 C471.57895,73.7777778 473.444444,75.6432726 473.444444,77.9444444 C473.444444,80.2456163 471.57895,82.1111111 469.277778,82.1111111 C468.296528,82.1111111 467.394661,81.7717448 466.682726,81.2041667 L462.234549,83.9842882 C462.366276,84.5801474 462.366276,85.197587 462.234549,85.7934462 L466.682726,88.5735677 C467.394661,88.006033 468.296528,87.6666667 469.277778,87.6666667 C471.57895,87.6666667 473.444444,89.5321615 473.444444,91.8333333 C473.444444,94.1345052 471.57895,96 469.277778,96 C466.976606,96 465.111111,94.1345052 465.111111,91.8333333 C465.111023,91.5291178 465.144147,91.2258017 465.209896,90.928776 L460.761719,88.1486545 C460.049783,88.7161892 459.147917,89.0555556 458.166667,89.0555556 C455.865495,89.0555556 454,87.1900608 454,84.8888889 C454,82.587717 455.865495,80.7222222 458.166667,80.7222222 C459.147917,80.7222222 460.049783,81.0615885 46 0.761719,81.6291233 L465.209896,78.8490017 C465.145399,78.5577257 465.111111,78.2551215 465.111111,77.9444444 C465.111111,77.2224682 465.29474,76.5433776 465.617841,75.95133 L461.36038,73.1130222 C460.739536,73.5327021 459.990981,73.7777778 459.185185,73.7777778 C457.037411,73.7777778 455.296296,72.0366629 455.296296,69.8888889 C455.296296,67.7411149 457.037411,66 459.185185,66 C461.332959,66 463.074074,67.7411149 463.074074,69.8888889 C463.074074,70.2848045 463.01491,70.6669018 462.904942,71.0268217 Z" id="Line-2" fill="#000000" fill-rule="nonzero"></path> - </g> -</svg> \ No newline at end of file diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index ed17f91d..576590a4 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -8,12 +8,12 @@ and lines drawn between them to represent Tor network inter-relay connections. #circuit-display-content { - background-image: url(chrome://torbutton/skin/relay.svg); + background-image: url(chrome://torbutton/skin/torbutton.svg); background-position: 1em 1em; background-repeat: no-repeat; background-size: 24px auto; - background-color: rgba(255,255,255,0.4); - background-blend-mode: lighten; + background-color: rgba(255,255,255,0.15); + background-blend-mode: overlay; cursor: default; padding: 0.5em 0px 0.5em; padding-inline-end: 1em; diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index 928ba93d..28333874 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -80,5 +80,5 @@ svg#tor-circuit circle.node-circle { } #appMenuNewCircuit { - list-style-image: url("chrome://torbutton/skin/relay.svg"); + list-style-image: url("chrome://torbutton/skin/new_circuit.svg"); }

1 0

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 06 Nov '18

06 Nov '18

commit 78574ef55b33501a61fa3fbb9fc266ceb6de86fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Nov 6 13:03:28 2018 +0000 Fold in stable changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 38b0b9a..3bd05ed 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -35,6 +35,20 @@ Tor Browser 8.5a4 -- October 23 2018 * OS X * Bug 27320: Build certutil for macOS +Tor Browser 8.0.3 -- October 23 2018 + * All platforms + * Update Firefox to 60.3.0esr + * Update Torbutton to 2.0.8 + * Bug 23925+27959: Donation banner for year end 2018 campaign + * Bug 24172: Donation banner clobbers Tor Browser version string + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Translations update + * Update HTTPS Everywhere to 2018.9.19 + * Update NoScript to 10.1.9.9 + * Linux + * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 + * Bug 27552: Use bundled dir on CentOS/RHEL 6 + Tor Browser 8.5a3 -- October 4 2018 * All platforms * Update Firefox to 60.2.1esr

1 0

[tor-browser-build/master] Bug 28310: don't build obfs4 with module versioning support
by gk＠torproject.org 05 Nov '18

05 Nov '18

commit 2e468e7b9b13cec82bd8034925433a7fd394a97d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 5 11:26:06 2018 +0100 Bug 28310: don't build obfs4 with module versioning support --- projects/obfs4/build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/obfs4/build b/projects/obfs4/build index 287704a..2c3f933 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -16,6 +16,12 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +[% IF c("var/nightly") -%] + # Remove go.mod and go.sum files until we can build using Go module + # versioning (see bug 28325). + rm -f go.mod go.sum +[% END -%] + mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy

1 0

[tor-browser-build/master] Bug 28258: Don't look for webrtc headers under talk/.
by gk＠torproject.org 31 Oct '18

31 Oct '18

commit 3e75d4bbf273c1494ff9442c67c0dda1f86c6eac Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 31 00:58:26 2018 -0600 Bug 28258: Don't look for webrtc headers under talk/. This avoids a harmless error message in the build log: find: `talk/': No such file or directory Compare to https://github.com/keroserene/go-webrtc/commit/bfbd31b3f439346e9cac73df0578… --- projects/webrtc/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 32a66b7..d3975b3 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -146,7 +146,7 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -for h in $(find talk/ webrtc/ -type f -name '*.h'); +for h in $(find webrtc/ -type f -name '*.h'); do mkdir -p "$INCLUDE_DIR/$(dirname $h)" cp -f "$h" "$INCLUDE_DIR/$h"

1 0

[tor-browser-build/master] Bug 27827: pass -tmpdir to the linker in snowflake build
by gk＠torproject.org 31 Oct '18

31 Oct '18

commit 28abf57bd5bd307262741ac679a80e98aa389d20 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Oct 16 18:40:59 2018 -0600 Bug 27827: pass -tmpdir to the linker in snowflake build The update to go 1.11.1 fixed part of #27827, namely the /tmp/go-buildRANDOMNUM paths embedded in the binary. However there is still a single /tmp/go-link-RANDOMNUM/go.o path remaining -- it comes from here: https://github.com/golang/go/blob/go1.11.1/src/cmd/link/internal/ld/lib.go#… The random path affects the Go build ID even if we overwrite the random digits in the binary. Luckily there's a -tmpdir flag that lets us override the random path. --- projects/snowflake/build | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 693d853..777d360 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -35,32 +35,13 @@ cd client [% IF c("var/osx") -%] # Without faketime, snowflake-client would contain the timestamp of the # temporary client.a file created during "go build". - [% c("var/faketime") %] go build -ldflags '-s' + # The -tmpdir flag overrides what would otherwise be a randomly generated + # path, /tmp/go-link-RANDOMNUM/go.o. + mkdir -p /var/tmp/go-link.tmpdir + [% c("var/faketime") %] go build -ldflags '-s -tmpdir /var/tmp/go-link.tmpdir' [% ELSE -%] go build -ldflags '-s' [% END -%] -[% IF c("var/osx") -%] - # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 - # on Darwin embeds such paths and the issue is unsolved in upstream Go as of - # 2016-06-28: - # https://github.com/golang/go/issues/9206#issuecomment-310476743 - # The two kinds of paths are ("000000000" stands for 9 random digits): - # /tmp/go-build000000000 - # /tmp/go-link-000000000 - # Such paths are the output of ioutil.TempDir("", "go-build") and - # ioutil.TempDir("", "go-link-"). - cp -a client client.stomped - sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped - # Sanity check: make sure the file actually changed. If it did not, it could - # mean that a change in go or clang has made this step unnecessary. - if cmp client client.stomped - then - echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." - echo "Check projects/snowflake/build" - exit 1 - fi - mv -f client.stomped client -[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd ..

1 0

[tor-browser-build/master] Bug 27827: update go to 1.11.1
by gk＠torproject.org 31 Oct '18

31 Oct '18

commit 1ca5a195c785f70cac791117a4e12d49482a206f Author: David Fifield <david(a)bamsoftware.com> Date: Wed Oct 17 09:28:58 2018 -0600 Bug 27827: update go to 1.11.1 For some reason, this version of go requires setting _GLIBCXX_USE_CXX11_ABI=1 in the snowflake build, not only in go-webrtc. https://bugs.torproject.org/27827#comment:12 --- projects/go/config | 4 ++-- projects/snowflake/build | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/go/config b/projects/go/config index 2a3b1ad..1841705 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.8.3 +version: 1.11.1 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -84,7 +84,7 @@ input_files: enable: '[% c("var/windows") || c("var/osx") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5f5dea2447e7dcfdc50fa6b94c512e58bfba5673c039259fd843f68829d99fa6 + sha256sum: 558f8c169ae215e25b81421596e8de7572bd3ba824b79add22fba6e284db1117 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/snowflake/build b/projects/snowflake/build index f3616f4..693d853 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -5,6 +5,11 @@ [% IF c("var/linux") %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" + # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with + # the prebuilt libwebrtc-magic.a libraries. Since we build our own + # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, + # using CGO_CXXFLAGS. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1" [% END -%] distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%]

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 28125 - Prevent non-Necko network connections
by gk＠torproject.org 30 Oct '18

30 Oct '18

commit 2c4b103cfef5eafe276713478abf8bd1db057730 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Oct 25 19:17:09 2018 +0000 Bug 28125 - Prevent non-Necko network connections --- .../base/java/org/mozilla/gecko/CrashReporter.java | 5 ++ .../base/java/org/mozilla/gecko/SuggestClient.java | 5 ++ .../homepanel/topstories/PocketStoriesLoader.java | 5 ++ .../mozilla/gecko/distribution/Distribution.java | 5 ++ .../java/org/mozilla/gecko/dlc/BaseAction.java | 6 ++ .../java/org/mozilla/gecko/home/ImageLoader.java | 7 ++ .../mozilla/gecko/icons/loader/IconDownloader.java | 11 +++ .../mozilla/gecko/search/SearchEngineManager.java | 5 ++ .../org/mozilla/gecko/switchboard/SwitchBoard.java | 6 ++ .../org/mozilla/gecko/updater/UpdateService.java | 11 +++ .../gecko/media/GeckoMediaDrmBridgeV21.java | 77 +++++++++++--------- .../exoplayer2/upstream/DefaultHttpDataSource.java | 85 ++++++++++++---------- .../service/utils/AbstractCommunicator.java | 5 ++ 13 files changed, 157 insertions(+), 76 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java index f1305cfc5398..618278773c38 100644 --- a/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java +++ b/mobile/android/base/java/org/mozilla/gecko/CrashReporter.java @@ -472,6 +472,11 @@ public class CrashReporter extends AppCompatActivity } private void sendReport(File minidumpFile, Map<String, String> extras, File extrasFile) { + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "sendReport: This is Tor Browser. Skipping."); + return; + } + Log.i(LOGTAG, "sendReport: " + minidumpFile.getPath()); final CheckBox includeURLCheckbox = (CheckBox) findViewById(R.id.include_url); diff --git a/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java b/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java index 0ebffeccdf21..137e53cc5c03 100644 --- a/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java +++ b/mobile/android/base/java/org/mozilla/gecko/SuggestClient.java @@ -72,6 +72,11 @@ public class SuggestClient { return mPrevResults; ArrayList<String> suggestions = new ArrayList<String>(); + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return suggestions; + } + if (TextUtils.isEmpty(mSuggestTemplate) || TextUtils.isEmpty(query)) { return suggestions; } diff --git a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java index 7ebead4cfa3f..516c13610047 100644 --- a/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/activitystream/homepanel/topstories/PocketStoriesLoader.java @@ -124,6 +124,11 @@ public class PocketStoriesLoader extends AsyncTaskLoader<List<TopStory>> { } protected String makeAPIRequestWithKey(final String apiKey) { + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + HttpURLConnection connection = null; final Uri uri = Uri.parse(GLOBAL_ENDPOINT) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index 7b93eb568acc..ea9534bfd741 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -534,6 +534,11 @@ public class Distribution { return false; } + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return false; + } + URI uri = getReferredDistribution(referrer); if (uri == null) { return false; diff --git a/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java b/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java index 5b1e0004fef1..56cfde26160c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java +++ b/mobile/android/base/java/org/mozilla/gecko/dlc/BaseAction.java @@ -151,6 +151,12 @@ public abstract class BaseAction { protected HttpURLConnection buildHttpURLConnection(String url) throws UnrecoverableDownloadContentException, IOException { try { + if (AppConstants.isTorBrowser()) { + String erdcl = "This is Tor Browser. Downloading is disabled for: " + url; + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + throw new UnrecoverableDownloadContentException(erdcl); + } + System.setProperty("http.keepAlive", "true"); HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(new URI(url)); diff --git a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java index cbbe7babbba4..b6ea0249445c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java @@ -15,6 +15,7 @@ import com.squareup.picasso.Picasso; import com.squareup.picasso.Downloader.Response; import com.squareup.picasso.UrlConnectionDownloader; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.util.ProxySelector; import java.io.File; @@ -91,6 +92,12 @@ public class ImageLoader { @Override protected HttpURLConnection openConnection(Uri path) throws IOException { + if (AppConstants.isTorBrowser()) { + String err = "This is Tor Browser. Downloading is disabled for: " + path.toString(); + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + throw new IOException(err); + } + try { // This is annoying, but |path| is an android.net.Uri and // openConnectionWithProxy() accepts a java.net.URI diff --git a/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java b/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java index 4a03d440556d..84eb7736e94e 100644 --- a/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java +++ b/mobile/android/base/java/org/mozilla/gecko/icons/loader/IconDownloader.java @@ -12,6 +12,7 @@ import android.support.annotation.Nullable; import android.support.annotation.VisibleForTesting; import android.util.Log; +import org.mozilla.gecko.AppConstants; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.icons.decoders.FaviconDecoder; import org.mozilla.gecko.icons.decoders.LoadFaviconResult; @@ -132,6 +133,11 @@ public class IconDownloader implements IconLoader { return null; } + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + HttpURLConnection connection = null; try { @@ -183,6 +189,11 @@ public class IconDownloader implements IconLoader { @VisibleForTesting @NonNull HttpURLConnection connectTo(String uri) throws URISyntaxException, IOException { + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + throw new IOException(); + } + final HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy( new URI(uri)); diff --git a/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java b/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java index 1004b7b25ef1..df9b6d67b467 100644 --- a/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java +++ b/mobile/android/base/java/org/mozilla/gecko/search/SearchEngineManager.java @@ -379,6 +379,11 @@ public class SearchEngineManager implements SharedPreferences.OnSharedPreference * @return String containing the country code */ private String fetchCountryCode() { + if (AppConstants.isTorBrowser()) { + Log.i(LOG_TAG, "This is Tor Browser. Skipping."); + return null; + } + // First, we look to see if we have a cached code. final String region = GeckoSharedPrefs.forApp(context).getString(PREF_REGION_KEY, null); if (region != null) { diff --git a/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java b/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java index d78663060f99..e32b50ebadb5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java +++ b/mobile/android/base/java/org/mozilla/gecko/switchboard/SwitchBoard.java @@ -409,6 +409,12 @@ public class SwitchBoard { HttpURLConnection connection = null; InputStreamReader inputStreamReader = null; BufferedReader bufferReader = null; + + if (AppConstants.isTorBrowser()) { + Log.i(TAG, "This is Tor Browser. Skipping."); + return null; + } + try { connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); connection.setRequestProperty("User-Agent", HardwareUtils.isTablet() ? diff --git a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java index 0598105fe108..71e1097711d9 100644 --- a/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java +++ b/mobile/android/base/java/org/mozilla/gecko/updater/UpdateService.java @@ -379,6 +379,11 @@ public class UpdateService extends IntentService { try { URI uri = getUpdateURI(force); + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + if (uri == null) { Log.e(LOGTAG, "failed to get update URI"); return null; @@ -527,6 +532,12 @@ public class UpdateService extends IntentService { private File downloadUpdatePackage(UpdateInfo info, boolean overwriteExisting) { URL url = null; + + if (AppConstants.isTorBrowser()) { + Log.i(LOGTAG, "This is Tor Browser. Skipping."); + return null; + } + try { url = info.uri.toURL(); } catch (java.net.MalformedURLException e) { diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java index d0973f3dcc17..39d10615d35c 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java @@ -473,43 +473,48 @@ public class GeckoMediaDrmBridgeV21 implements GeckoMediaDrm { @Override protected Void doInBackground(Void... params) { - try { - URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); - HttpURLConnection urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); - urlConnection.setRequestMethod("POST"); - if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); - - // Add data - urlConnection.setRequestProperty("Accept", "*/*"); - urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); - urlConnection.setRequestProperty("Content-Type", "application/json"); - - // Execute HTTP Post Request - urlConnection.connect(); - - int responseCode = urlConnection.getResponseCode(); - if (responseCode == HttpURLConnection.HTTP_OK) { - BufferedReader in = - new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8)); - String inputLine; - StringBuffer response = new StringBuffer(); - - while ((inputLine = in.readLine()) != null) { - response.append(inputLine); - } - in.close(); - mResponseBody = String.valueOf(response).getBytes(StringUtils.UTF_8); - if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); - if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); - } else { - Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); - } - } catch (IOException e) { - Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); - } catch (URISyntaxException e) { - Log.e(LOGTAG, "Got exception during creating uri ...", e); - } + // AppConstants.isTorBrowser() is in base/, so it's not available in geckoview/ + Log.i(LOGTAG, "This is Tor Browser. Skipping."); return null; + + /* Dead code */ + //try { + // URI finalURI = new URI(mURL + "&signedRequest=" + URLEncoder.encode(new String(mDrmRequest), "UTF-8")); + // HttpURLConnection urlConnection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(finalURI); + // urlConnection.setRequestMethod("POST"); + // if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" + finalURI.toString()); + + // // Add data + // urlConnection.setRequestProperty("Accept", "*/*"); + // urlConnection.setRequestProperty("User-Agent", getCDMUserAgent()); + // urlConnection.setRequestProperty("Content-Type", "application/json"); + + // // Execute HTTP Post Request + // urlConnection.connect(); + + // int responseCode = urlConnection.getResponseCode(); + // if (responseCode == HttpURLConnection.HTTP_OK) { + // BufferedReader in = + // new BufferedReader(new InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8)); + // String inputLine; + // StringBuffer response = new StringBuffer(); + + // while ((inputLine = in.readLine()) != null) { + // response.append(inputLine); + // } + // in.close(); + // mResponseBody = String.valueOf(response).getBytes(StringUtils.UTF_8); + // if (DEBUG) Log.d(LOGTAG, "Provisioning, response received."); + // if (mResponseBody != null) Log.d(LOGTAG, "response length=" + mResponseBody.length); + // } else { + // Log.d(LOGTAG, "Provisioning, server returned HTTP error code :" + responseCode); + // } + //} catch (IOException e) { + // Log.e(LOGTAG, "Got exception during posting provisioning request ...", e); + //} catch (URISyntaxException e) { + // Log.e(LOGTAG, "Got exception during creating uri ...", e); + //} + //return null; } @Override diff --git a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 75e1f675c5eb..22e9e1ffcb9b 100644 --- a/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/mobile/android/geckoview/src/thirdparty/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -395,51 +395,56 @@ public class DefaultHttpDataSource implements HttpDataSource { */ private HttpURLConnection makeConnection(URL url, byte[] postBody, long position, long length, boolean allowGzip, boolean followRedirects) throws IOException, URISyntaxException { + // AppConstants.isTorBrowser() is in base/, so it's not available in geckoview/ + Log.i(TAG, "This is Tor Browser. Skipping."); + throw new IOException(); + /** * Tor Project modified the way the connection object was created. For the sake of * simplicity, instead of duplicating the whole file we changed the connection object * to use the ProxySelector. */ - HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); - - connection.setConnectTimeout(connectTimeoutMillis); - connection.setReadTimeout(readTimeoutMillis); - if (defaultRequestProperties != null) { - for (Map.Entry<String, String> property : defaultRequestProperties.getSnapshot().entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - } - for (Map.Entry<String, String> property : requestProperties.getSnapshot().entrySet()) { - connection.setRequestProperty(property.getKey(), property.getValue()); - } - if (!(position == 0 && length == C.LENGTH_UNSET)) { - String rangeRequest = "bytes=" + position + "-"; - if (length != C.LENGTH_UNSET) { - rangeRequest += (position + length - 1); - } - connection.setRequestProperty("Range", rangeRequest); - } - connection.setRequestProperty("User-Agent", userAgent); - if (!allowGzip) { - connection.setRequestProperty("Accept-Encoding", "identity"); - } - connection.setInstanceFollowRedirects(followRedirects); - connection.setDoOutput(postBody != null); - if (postBody != null) { - connection.setRequestMethod("POST"); - if (postBody.length == 0) { - connection.connect(); - } else { - connection.setFixedLengthStreamingMode(postBody.length); - connection.connect(); - OutputStream os = connection.getOutputStream(); - os.write(postBody); - os.close(); - } - } else { - connection.connect(); - } - return connection; + /* Dead code */ + //HttpURLConnection connection = (HttpURLConnection) ProxySelector.openConnectionWithProxy(url.toURI()); + + //connection.setConnectTimeout(connectTimeoutMillis); + //connection.setReadTimeout(readTimeoutMillis); + //if (defaultRequestProperties != null) { + // for (Map.Entry<String, String> property : defaultRequestProperties.getSnapshot().entrySet()) { + // connection.setRequestProperty(property.getKey(), property.getValue()); + // } + //} + //for (Map.Entry<String, String> property : requestProperties.getSnapshot().entrySet()) { + // connection.setRequestProperty(property.getKey(), property.getValue()); + //} + //if (!(position == 0 && length == C.LENGTH_UNSET)) { + // String rangeRequest = "bytes=" + position + "-"; + // if (length != C.LENGTH_UNSET) { + // rangeRequest += (position + length - 1); + // } + // connection.setRequestProperty("Range", rangeRequest); + //} + //connection.setRequestProperty("User-Agent", userAgent); + //if (!allowGzip) { + // connection.setRequestProperty("Accept-Encoding", "identity"); + //} + //connection.setInstanceFollowRedirects(followRedirects); + //connection.setDoOutput(postBody != null); + //if (postBody != null) { + // connection.setRequestMethod("POST"); + // if (postBody.length == 0) { + // connection.connect(); + // } else { + // connection.setFixedLengthStreamingMode(postBody.length); + // connection.connect(); + // OutputStream os = connection.getOutputStream(); + // os.write(postBody); + // os.close(); + // } + //} else { + // connection.connect(); + //} + //return connection; } /** diff --git a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java index 9b3ee98f89db..fc3248d72219 100644 --- a/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java +++ b/mobile/android/stumbler/java/org/mozilla/mozstumbler/service/utils/AbstractCommunicator.java @@ -68,6 +68,11 @@ public abstract class AbstractCommunicator { } private void openConnectionAndSetHeaders() { + if (AppConstants.isTorBrowser()) { + Log.i(LOG_TAG, "This is Tor Browser. Skipping."); + throw new Exception(); + } + try { Prefs prefs = Prefs.getInstanceWithoutContext(); if (sMozApiKey == null || prefs != null) {

1 0