- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-5.0] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit badf55cb0fdda5c3c893f01f996a29a4e105d3d7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..a371403 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -421,7 +421,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/maint-5.0] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit f3a1676797a35a63ff2e40f89e6aab169b8661b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a371403..a875774 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -329,6 +329,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/master] Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 7097c9651a556a314a8265226e2e2c111934a7b0 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 12:11:29 2015 +0200 Bug 16973: Add the mar-tools dir to LD_LIBRARY_PATH --- tools/update-responses/update_responses | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index bb285fd..b1b3331 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -331,6 +331,11 @@ sub extract_martools { chdir $old_cwd; exit_error "Error extracting $marzip" unless $success; $ENV{PATH} .= ":$martools_tmpdir/mar-tools"; + if ($ENV{LD_LIBRARY_PATH}) { + $ENV{LD_LIBRARY_PATH} .= ":$martools_tmpdir/mar-tools"; + } else { + $ENV{LD_LIBRARY_PATH} = "$martools_tmpdir/mar-tools"; + } } sub log_step {

1 0

[tor-browser-bundle/master] Bug 16973: fix gpg keyring path
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit 199808ddbe8e9f640bc8cef57e6f09f2f3070d95 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 3 11:35:34 2015 +0200 Bug 16973: fix gpg keyring path The path defined in config.yml is relative to the tools/update-responses directory, but we usually run the script from the Makefile in the gitian directory. This patch makes it work from anywhere. --- tools/update-responses/update_responses | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 4f6286d..bb285fd 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -423,7 +423,7 @@ sub download_version { } } if (system('gpg', '--no-default-keyring', '--keyring', - $config->{download}{gpg_keyring}, '--verify', + "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', "$tmpdir/sha256sums-unsigned-build.txt.asc", "$tmpdir/sha256sums-unsigned-build.txt")) { exit_error "Error checking gpg signature for version $version";

1 0

[tor-browser-bundle/maint-5.0] Update Tor Browser key
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit ce86c32d1160983b08775cd154f22dbb3d303947 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 07:28:33 2015 +0000 Update Tor Browser key --- gitian/gpg/torbrowser.gpg | Bin 6015 -> 18844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index 7267d4d..dc44e33 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bug 16948: Download PyCrypto from pypi.python.org
by gk＠torproject.org 03 Sep '15

03 Sep '15

1 0

[tor-browser-bundle/master] Bug 16948: Download PyCrypto from pypi.python.org
by gk＠torproject.org 03 Sep '15

03 Sep '15

1 0

[tor-browser-bundle/master] Update Tor Browser key
by gk＠torproject.org 03 Sep '15

03 Sep '15

commit b5533d49b8dbc8b24ffddae56623bb38e380875f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 3 07:12:38 2015 +0000 Update Tor Browser key --- gitian/gpg/torbrowser.gpg | Bin 6015 -> 18844 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbrowser.gpg b/gitian/gpg/torbrowser.gpg index 7267d4d..dc44e33 100644 Binary files a/gitian/gpg/torbrowser.gpg and b/gitian/gpg/torbrowser.gpg differ

1 0

[tor-browser-bundle/maint-5.0] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit bc17a40f050335b9dbfaff73ac0233e48ead546e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0

[tor-browser-bundle/master] Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit e594dfac1fdb2bf32a51a0020e59fa1a9826f6ba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:50:47 2015 +0200 Bug 16963: use the right commit hash in TORBROWSER_BUILDDIR --- gitian/get-tb-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index bc3181c..07c5962 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -44,7 +44,7 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { next unless $tags{$commit}; print "TORBROWSER_VERSION=$tags{$commit}->[0]\n"; print "TORBROWSER_BUILDDIR=$tags{$commit}->[0]-", - substr($commit, 0, 12), "\n"; + substr($current_commit, 0, 12), "\n"; print "TORBROWSER_SYMLINK_VERSION=0\n"; exit 0; }

1 0

[tor-browser-bundle/maint-5.0] Bug 16956: Make explicit error when no version tag is found
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit 5a8177f0164a3f19fe11a970b4b61dea04c334a2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:33:46 2015 +0200 Bug 16956: Make explicit error when no version tag is found --- gitian/get-tb-version | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index 9a4a102..bc3181c 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -49,5 +49,6 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { exit 0; } -print STDERR "Could not find TORBROWSER version from tags\n"; +print STDERR "Could not find TORBROWSER version from tags. Does your git repo have tags?\n"; +print "exit 1\n"; exit 1;

1 0

[tor-browser-bundle/master] Bug 16956: Make explicit error when no version tag is found
by gk＠torproject.org 02 Sep '15

02 Sep '15

commit 4a83432493057ad9cb60416b1fc121b51cbff238 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 2 12:33:46 2015 +0200 Bug 16956: Make explicit error when no version tag is found --- gitian/get-tb-version | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/get-tb-version b/gitian/get-tb-version index 9a4a102..bc3181c 100755 --- a/gitian/get-tb-version +++ b/gitian/get-tb-version @@ -49,5 +49,6 @@ foreach my $commit (run_cmd('git', 'log', '-s', '--format=%H', '-200')) { exit 0; } -print STDERR "Could not find TORBROWSER version from tags\n"; +print STDERR "Could not find TORBROWSER version from tags. Does your git repo have tags?\n"; +print "exit 1\n"; exit 1;

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! Bug 12827: Create preference to disable SVG.
by gk＠torproject.org 01 Sep '15

01 Sep '15

commit 191176cf015236f75da321b2ca0e8ddcd6881a55 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 21 14:59:51 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. Allow SVG on about:preferences and other about: pages. Fixes #16775. --- layout/svg/moz.build | 2 ++ layout/svg/nsSVGUtils.cpp | 88 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/layout/svg/moz.build b/layout/svg/moz.build index df2c209..7685cf5 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -54,6 +54,8 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: FAIL_ON_WARNINGS = True +#DEFINES['DEBUG_SVG_ENABLE'] = True + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../widget', diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index c2b6608..5a66b8c 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -66,8 +66,12 @@ static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled; static bool sSVGNewGetBBoxEnabled; +static bool IsWhitelisted(nsIURI *aURI); + // Determine if SVG should be enabled for aDoc. The svg.in-content.enabled -// preference is checked as well as whether aDoc is a content or chrome doc. +// preference is checked, then we check whether aDoc is a chrome doc, and +// finally as a fallback we check whether the top-level document is +// whitelisted (e.g., about:preferences). // If aDoc is NULL, the pref. value is returned. // Once we determine whether SVG is allowed for a given document, we record // that fact inside the document. This is necessary to avoid crashes due @@ -92,8 +96,9 @@ NS_SVGEnabled(nsIDocument *aDoc) } // Determine if SVG should be enabled for aChannel. The svg.in-content.enabled -// preference is checked as well as whether the load context associated with -// aChannel is content or chrome. +// preference is checked, then we check whether the load context associated +// with aChannel is a chrome doc, and finally as a fallback we check whether +// the top-level document is whitelisted (e.g., about:preferences). // If aChannel is NULL, the pref. value is returned. bool NS_SVGEnabledForChannel(nsIChannel *aChannel) @@ -104,13 +109,84 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) if (!aChannel) return false; - bool isContent = true; +#ifdef DEBUG_SVG_ENABLE + nsAutoCString topDocSpec; // Set if approved via a whitelisted top doc. +#endif + + bool isSVGAllowed = false; nsCOMPtr<nsILoadContext> ctx; NS_QueryNotificationCallbacks(aChannel, ctx); - if (ctx) + if (ctx) { + bool isContent = true; ctx->GetIsContent(&isContent); + if (!isContent) { + isSVGAllowed = true; + } else { + // Disallowed. As a fallback, check for whitelisted URLs. + uint32_t loadFlags = 0; + aChannel->GetLoadFlags(&loadFlags); + if (loadFlags & nsIChannel::LOAD_INITIAL_DOCUMENT_URI) { + // This is the top-level load; just check the channel's URL. + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + isSVGAllowed = IsWhitelisted(uri); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + uri->GetSpec(topDocSpec); +#endif + } else { + // Obtain the top window's document and check it's URL. + nsCOMPtr<nsIDOMWindow> topWin; + ctx->GetTopWindow(getter_AddRefs(topWin)); + if (topWin) { + nsCOMPtr<nsIDOMDocument> topDOMDoc; + topWin->GetDocument(getter_AddRefs(topDOMDoc)); + nsCOMPtr<nsIDocument> topDoc = do_QueryInterface(topDOMDoc); + if (topDoc) { + nsIURI *topDocURI = topDoc->GetDocumentURI(); + isSVGAllowed = IsWhitelisted(topDocURI); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + topDocURI->GetSpec(topDocSpec); +#endif + } + } + } + } + } + +#ifdef DEBUG_SVG_ENABLE + nsAutoCString spec; + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + if (uri) + uri->GetSpec(spec); + + if (topDocSpec.IsEmpty()) { + printf("NS_SVGEnabledForChannel for %s: %s\n", spec.get(), + isSVGAllowed ? "YES" : "NO"); + } else { + printf("NS_SVGEnabledForChannel for %s: %s (via whitelisted top doc %s)\n", + spec.get(), isSVGAllowed ? "YES" : "NO", topDocSpec.get()); + } +#endif + + return isSVGAllowed; +} + +// Always allow SVG for about: URLs so that about:preferences and other +// built-in browser pages function correctly. Exclude about:blank because +// iframes initially contain about:blank documents, and since we cache the +// SVG status we must avoid enabling SVG in that case. +static bool +IsWhitelisted(nsIURI *aURI) +{ + if (!aURI) + return false; - return !isContent; + nsAutoCString scheme; + aURI->GetScheme(scheme); + return scheme.EqualsLiteral("about") && !NS_IsAboutBlank(aURI); } bool

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug 12827: Create preference to disable SVG.
by gk＠torproject.org 01 Sep '15

01 Sep '15

commit d8419037dbb3d36115702cc19de9380c6d9c0f10 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Aug 21 14:59:51 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. Allow SVG on about:preferences and other about: pages. Fixes #16775. --- layout/svg/moz.build | 2 ++ layout/svg/nsSVGUtils.cpp | 88 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/layout/svg/moz.build b/layout/svg/moz.build index df2c209..7685cf5 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -54,6 +54,8 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: FAIL_ON_WARNINGS = True +#DEFINES['DEBUG_SVG_ENABLE'] = True + FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ '../../widget', diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index c2b6608..5a66b8c 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -66,8 +66,12 @@ static bool sSVGDisplayListHitTestingEnabled; static bool sSVGDisplayListPaintingEnabled; static bool sSVGNewGetBBoxEnabled; +static bool IsWhitelisted(nsIURI *aURI); + // Determine if SVG should be enabled for aDoc. The svg.in-content.enabled -// preference is checked as well as whether aDoc is a content or chrome doc. +// preference is checked, then we check whether aDoc is a chrome doc, and +// finally as a fallback we check whether the top-level document is +// whitelisted (e.g., about:preferences). // If aDoc is NULL, the pref. value is returned. // Once we determine whether SVG is allowed for a given document, we record // that fact inside the document. This is necessary to avoid crashes due @@ -92,8 +96,9 @@ NS_SVGEnabled(nsIDocument *aDoc) } // Determine if SVG should be enabled for aChannel. The svg.in-content.enabled -// preference is checked as well as whether the load context associated with -// aChannel is content or chrome. +// preference is checked, then we check whether the load context associated +// with aChannel is a chrome doc, and finally as a fallback we check whether +// the top-level document is whitelisted (e.g., about:preferences). // If aChannel is NULL, the pref. value is returned. bool NS_SVGEnabledForChannel(nsIChannel *aChannel) @@ -104,13 +109,84 @@ NS_SVGEnabledForChannel(nsIChannel *aChannel) if (!aChannel) return false; - bool isContent = true; +#ifdef DEBUG_SVG_ENABLE + nsAutoCString topDocSpec; // Set if approved via a whitelisted top doc. +#endif + + bool isSVGAllowed = false; nsCOMPtr<nsILoadContext> ctx; NS_QueryNotificationCallbacks(aChannel, ctx); - if (ctx) + if (ctx) { + bool isContent = true; ctx->GetIsContent(&isContent); + if (!isContent) { + isSVGAllowed = true; + } else { + // Disallowed. As a fallback, check for whitelisted URLs. + uint32_t loadFlags = 0; + aChannel->GetLoadFlags(&loadFlags); + if (loadFlags & nsIChannel::LOAD_INITIAL_DOCUMENT_URI) { + // This is the top-level load; just check the channel's URL. + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + isSVGAllowed = IsWhitelisted(uri); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + uri->GetSpec(topDocSpec); +#endif + } else { + // Obtain the top window's document and check it's URL. + nsCOMPtr<nsIDOMWindow> topWin; + ctx->GetTopWindow(getter_AddRefs(topWin)); + if (topWin) { + nsCOMPtr<nsIDOMDocument> topDOMDoc; + topWin->GetDocument(getter_AddRefs(topDOMDoc)); + nsCOMPtr<nsIDocument> topDoc = do_QueryInterface(topDOMDoc); + if (topDoc) { + nsIURI *topDocURI = topDoc->GetDocumentURI(); + isSVGAllowed = IsWhitelisted(topDocURI); +#ifdef DEBUG_SVG_ENABLE + if (isSVGAllowed) + topDocURI->GetSpec(topDocSpec); +#endif + } + } + } + } + } + +#ifdef DEBUG_SVG_ENABLE + nsAutoCString spec; + nsCOMPtr<nsIURI> uri; + aChannel->GetOriginalURI(getter_AddRefs(uri)); + if (uri) + uri->GetSpec(spec); + + if (topDocSpec.IsEmpty()) { + printf("NS_SVGEnabledForChannel for %s: %s\n", spec.get(), + isSVGAllowed ? "YES" : "NO"); + } else { + printf("NS_SVGEnabledForChannel for %s: %s (via whitelisted top doc %s)\n", + spec.get(), isSVGAllowed ? "YES" : "NO", topDocSpec.get()); + } +#endif + + return isSVGAllowed; +} + +// Always allow SVG for about: URLs so that about:preferences and other +// built-in browser pages function correctly. Exclude about:blank because +// iframes initially contain about:blank documents, and since we cache the +// SVG status we must avoid enabling SVG in that case. +static bool +IsWhitelisted(nsIURI *aURI) +{ + if (!aURI) + return false; - return !isContent; + nsAutoCString scheme; + aURI->GetScheme(scheme); + return scheme.EqualsLiteral("about") && !NS_IsAboutBlank(aURI); } bool

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 01 Sep '15

01 Sep '15

commit 8882fd2ca86bc843060556b8126de75046a35f8f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 25 11:03:21 2015 -0400 fixup! Bug #4234: Use the Firefox Update Process for Tor Browser. Fixes #13512: After update, load a static tab with change notes. To use this feature, include the following attributes within the <update> element of each XML update manifest: actions="showURL" openURL="https://..." Within the URL, %OLD_VERSION% will be replaced with the previous Gecko version (e.g., 38.2.0) and %OLD_TOR_BROWSER_VERSION% will be replaced with the previous Tor Browser version (e.g., 5.5a1). Note that the "Update Installed" window that previously was displayed after an update is no longer opened. --- browser/app/profile/000-tor-browser.js | 9 ++++- browser/app/profile/firefox.js | 2 +- browser/components/nsBrowserContentHandler.js | 50 ++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 5918a3e..b32728b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -7,9 +7,14 @@ // Disable initial homepage notifications pref("browser.search.update", false); pref("browser.rights.3.shown", true); -pref("browser.startup.homepage_override.mstone", "ignore"); pref("startup.homepage_welcome_url", ""); -pref("startup.homepage_override_url", ""); + +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/tags/tor-browser"); // Try to nag a bit more about updates: Pop up a restart dialog an hour after the initial dialog pref("app.update.promptWaitTime", 3600); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 53fd8d2..7d9677a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -190,7 +190,7 @@ pref("app.update.idletime", 60); // upgrade start page instead! Other apps may wish to show this UI, and supply // a whatsNewURL field in their brand.properties that contains a link to a page // which tells users what's new in this new update. -pref("app.update.showInstalledUI", true); +pref("app.update.showInstalledUI", false); // 0 = suppress prompting for incompatibilities if there are updates available // to newer versions of installed addons that resolve them. diff --git a/browser/components/nsBrowserContentHandler.js b/browser/components/nsBrowserContentHandler.js index 9ae384e..a3465a0 100644 --- a/browser/components/nsBrowserContentHandler.js +++ b/browser/components/nsBrowserContentHandler.js @@ -43,6 +43,10 @@ const NS_ERROR_ABORT = Components.results.NS_ERROR_ABORT; const URI_INHERITS_SECURITY_CONTEXT = Components.interfaces.nsIHttpProtocolHandler .URI_INHERITS_SECURITY_CONTEXT; +#ifdef TOR_BROWSER_VERSION +const kTBSavedVersionPref = "browser.startup.homepage_override.torbrowser.version"; +#endif + function shouldLoadURI(aURI) { if (aURI && !aURI.schemeIs("chrome")) return true; @@ -94,7 +98,8 @@ const OVERRIDE_NEW_BUILD_ID = 3; * Returns: * OVERRIDE_NEW_PROFILE if this is the first run with a new profile. * OVERRIDE_NEW_MSTONE if this is the first run with a build with a different - * Gecko milestone (i.e. right after an upgrade). + * Gecko milestone or Tor Browser version (i.e. right + * after an upgrade). * OVERRIDE_NEW_BUILD_ID if this is the first run with a new build ID of the * same Gecko milestone (i.e. after a nightly upgrade). * OVERRIDE_NONE otherwise. @@ -110,6 +115,15 @@ function needHomepageOverride(prefb) { var mstone = Services.appinfo.platformVersion; +#ifdef TOR_BROWSER_VERSION +#expand const TOR_BROWSER_VERSION = __TOR_BROWSER_VERSION__; + + var savedTBVersion = null; + try { + savedTBVersion = prefb.getCharPref(kTBSavedVersionPref); + } catch (e) {} +#endif + var savedBuildID = null; try { savedBuildID = prefb.getCharPref("browser.startup.homepage_override.buildID"); @@ -127,9 +141,30 @@ function needHomepageOverride(prefb) { prefb.setCharPref("browser.startup.homepage_override.mstone", mstone); prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); +#ifdef TOR_BROWSER_VERSION + prefb.setCharPref(kTBSavedVersionPref, TOR_BROWSER_VERSION); + + // After an upgrade from an older release of Tor Browser (<= 5.5a1), the + // savedmstone will be undefined because those releases included the + // value "ignore" for the browser.startup.homepage_override.mstone pref. + // To correctly detect an upgrade vs. a new profile, we check for the + // presence of the "app.update.postupdate" pref. + var updated = prefb.prefHasUserValue("app.update.postupdate"); + return (savedmstone || updated) ? OVERRIDE_NEW_MSTONE + : OVERRIDE_NEW_PROFILE; +#else return (savedmstone ? OVERRIDE_NEW_MSTONE : OVERRIDE_NEW_PROFILE); +#endif } +#ifdef TOR_BROWSER_VERSION + if (TOR_BROWSER_VERSION != savedTBVersion) { + prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); + prefb.setCharPref(kTBSavedVersionPref, TOR_BROWSER_VERSION); + return OVERRIDE_NEW_MSTONE; + } +#endif + if (buildID != savedBuildID) { prefb.setCharPref("browser.startup.homepage_override.buildID", buildID); return OVERRIDE_NEW_BUILD_ID; @@ -572,6 +607,15 @@ nsBrowserContentHandler.prototype = { try { old_mstone = Services.prefs.getCharPref("browser.startup.homepage_override.mstone"); } catch (ex) {} + +#ifdef TOR_BROWSER_VERSION + // We do the same for the Tor Browser version. + var old_tbversion = null; + try { + old_tbversion = prefb.getCharPref(kTBSavedVersionPref); + } catch (e) {} +#endif + let override = needHomepageOverride(prefb); if (override != OVERRIDE_NONE) { switch (override) { @@ -594,6 +638,10 @@ nsBrowserContentHandler.prototype = { overridePage = getPostUpdateOverridePage(overridePage); overridePage = overridePage.replace("%OLD_VERSION%", old_mstone); +#ifdef TOR_BROWSER_VERSION + overridePage = overridePage.replace("%OLD_TOR_BROWSER_VERSION%", + old_tbversion); +#endif break; } }

1 0

[tor-browser-bundle/master] Bug 13512: update_responses - add the actions and openURL attributes
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 276687123cd14f6889c7506016d1d233a3e74628 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 15:54:36 2015 +0200 Bug 13512: update_responses - add the actions and openURL attributes --- tools/update-responses/update_responses | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index d238d3a..4f6286d 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -226,6 +226,8 @@ sub get_response { platformVersion => get_config($config, $version, $os, 'platformVersion'), buildID => '20000101000000', detailsURL => get_config($config, $version, $os, 'detailsURL'), + actions => 'showURL', + openURL => get_config($config, $version, $os, 'detailsURL'), defined $minversion ? ( minSupportedOSVersion => $minversion ) : (), ); foreach my $patch (@patches) {

1 0

[tor-browser-bundle/master] Point detailsURL to our blog
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit fb4e9c0b57e7c8fb67e9924443400af8ad7d0c09 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 31 11:20:39 2015 +0000 Point detailsURL to our blog This is a follow-up to bug 13512 which should help reminding us to bump the version in the detailsURL when the next release is due. --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 761a987..fc44ddf 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -25,7 +25,7 @@ versions: detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… 5.5a2: platformVersion: 38.2.1 - detailsURL: https://www.torproject.org/projects/torbrowser.html.en + detailsURL: https://blog.torproject.org/blog/tor-browser-55a2-released download_url: https://www.torproject.org/dist/torbrowser/5.5a2 incremental_from: - 5.5a1

1 0

[tor-browser-bundle/master] Bump nightly tor-browser branch
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 3149bcc9b8671ed5b513b24f06a708fe14082234 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 31 11:06:04 2015 +0000 Bump nightly tor-browser branch --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8d7469e..1308302 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.2.0esr +FIREFOX_VERSION=38.2.1esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser-bundle/master] Revert "Revert "Bug 12240: Building OpenSSL reproducibly with LXC""
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit a640b2e3c2d58f89880350bdee883f7f1d2f90be Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 31 11:03:11 2015 +0000 Revert "Revert "Bug 12240: Building OpenSSL reproducibly with LXC"" This reverts commit b566f9f13978874e3d27428e56d44aec19421780. We are back on track and this fix should make it into the next alpha. It solves bug 12240. --- gitian/descriptors/mac/gitian-utils.yml | 20 +++++++++++++++++++- gitian/mkbundle-mac.sh | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index c47767e..d457fef 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -16,6 +16,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -24,6 +26,7 @@ files: - "gmp.tar.bz2" - "versions" - "dzip.sh" +- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions @@ -44,8 +47,17 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc cp *utils.zip $OUTDIR/ else - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Building libfaketime. + cd faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" export FAKETIME=$REFERENCE_DATETIME + cd .. sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz @@ -65,6 +77,7 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -84,10 +97,15 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index cf54e19..4e458bd 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -114,7 +114,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 0febd3270179aa6e9ec7255181612764d074f5f6 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 6fec465fa4e2feea64526850387c91f7f67c2446 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 85ae5da40c3b969157243e62f8f5b35829577717 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 19 13:51:11 2015 -0400 fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once Account for ESR38 login manager changes: skip storage initialization if security.nocertdb = true and set _storage to null upon failure. Fixes #16842. --- toolkit/components/passwordmgr/nsLoginManager.js | 104 +++++++++++++--------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index f2b77ac..9648f8f 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -153,9 +153,25 @@ LoginManager.prototype = { log("No alternate nsILoginManagerStorage registered"); } - this._storage = Cc[contractID]. - createInstance(Ci.nsILoginManagerStorage); - this.initializationPromise = this._storage.initialize(); + // If the security.nocertdb pref. is true, we skip initialization of + // login manager storage since we know it will fail. In this case we + // pretend that initialization succeeded in order to avoid a cascade of + // initialization errors. + if (Services.prefs.getBoolPref("security.nocertdb")) { + this._storage = null; + this.initializationPromise = Promise.resolve(); + } else { + this._storage = Cc[contractID]. + createInstance(Ci.nsILoginManagerStorage); + try { + this.initializationPromise = this._storage.initialize(); + } catch (e) { + // If storage is not available, set _storage to null so that we can + // cleanly check for a lack of storage elsewhere in this file. + this._storage = null; + this.initializationPromise = Promise.reject(e); + } + } }, @@ -196,7 +212,8 @@ LoginManager.prototype = { this._pwmgr = null; } else if (topic == "passwordmgr-storage-replace") { Task.spawn(function () { - yield this._pwmgr._storage.terminate(); + if (this._pwmgr._storage) + yield this._pwmgr._storage.terminate(); this._pwmgr._initStorage(); yield this._pwmgr.initializationPromise; Services.obs.notifyObservers(null, @@ -331,9 +348,8 @@ LoginManager.prototype = { if (logins.some(function(l) login.matches(l, true))) throw "This login already exists."; - if (!this._storage) { - throw "No storage to add login"; - } + if (!this._storage) + throw "No storage to add login"; log("Adding login"); return this._storage.addLogin(login); @@ -348,10 +364,10 @@ LoginManager.prototype = { removeLogin : function (login) { log("Removing login"); - if (!this._storage) { - log("No storage to remove login"); - return null; - } + if (!this._storage) { + log("No storage to remove login"); + return null; + } return this._storage.removeLogin(login); }, @@ -365,10 +381,10 @@ LoginManager.prototype = { modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); - if (!this._storage) { - log("No storage to modify login"); - return null; - } + if (!this._storage) { + log("No storage to modify login"); + return null; + } return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -386,10 +402,10 @@ LoginManager.prototype = { getAllLogins : function (count) { log("Getting a list of all logins"); - if (!this._storage) { - log("No storage to get all logins"); - return null; - } + if (!this._storage) { + log("No storage to get all logins"); + return null; + } return this._storage.getAllLogins(count); }, @@ -402,10 +418,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - if (!this._storage) - log("No storage to remove all logins"); - else - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -421,10 +437,10 @@ LoginManager.prototype = { getAllDisabledHosts : function (count) { log("Getting a list of all disabled hosts"); - if (!this._storage) { - log("No storage to get all disabled hosts"); - return null; - } + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } return this._storage.getAllDisabledHosts(count); }, @@ -439,10 +455,10 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) { - log("No storage to find logins"); - return null; - } + if (!this._storage) { + log("No storage to find logins"); + return null; + } return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); @@ -460,10 +476,10 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); - if (!this._storage) { - log("No storage to search logins"); - return null; - } + if (!this._storage) { + log("No storage to search logins"); + return null; + } return this._storage.searchLogins(count, matchData); }, @@ -479,8 +495,8 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) - return 0; + if (!this._storage) + return 0; return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -490,8 +506,8 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.uiBusy; }, @@ -501,8 +517,8 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.isLoggedIn; }, @@ -515,7 +531,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember || !this._storage) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -532,8 +548,8 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; - if (!this._storage) - throw "No storage to set login saving enabled"; + if (!this._storage) + throw "No storage to set login saving enabled"; log("Login saving for", hostname, "now enabled?", enabled); return this._storage.setLoginSavingEnabled(hostname, enabled);

1 0

[tor-browser/tor-browser-38.2.1esr-5.0-2] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit e1d7a8fe862d1e1c8f2707b6dc8d27cb65e7b4a2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 5ae8e3145026ed9ba40d33105a0478ff58089137 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index f21a564..5918a3e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit d97c1f91bd955e6d7aa9bcb086fceb3d1edbcdf2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 313e32cf752756d9c64e05058342cdda84d550e7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 19 13:51:11 2015 -0400 fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once Account for ESR38 login manager changes: skip storage initialization if security.nocertdb = true and set _storage to null upon failure. Fixes #16842. --- toolkit/components/passwordmgr/nsLoginManager.js | 104 +++++++++++++--------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index f2b77ac..9648f8f 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -153,9 +153,25 @@ LoginManager.prototype = { log("No alternate nsILoginManagerStorage registered"); } - this._storage = Cc[contractID]. - createInstance(Ci.nsILoginManagerStorage); - this.initializationPromise = this._storage.initialize(); + // If the security.nocertdb pref. is true, we skip initialization of + // login manager storage since we know it will fail. In this case we + // pretend that initialization succeeded in order to avoid a cascade of + // initialization errors. + if (Services.prefs.getBoolPref("security.nocertdb")) { + this._storage = null; + this.initializationPromise = Promise.resolve(); + } else { + this._storage = Cc[contractID]. + createInstance(Ci.nsILoginManagerStorage); + try { + this.initializationPromise = this._storage.initialize(); + } catch (e) { + // If storage is not available, set _storage to null so that we can + // cleanly check for a lack of storage elsewhere in this file. + this._storage = null; + this.initializationPromise = Promise.reject(e); + } + } }, @@ -196,7 +212,8 @@ LoginManager.prototype = { this._pwmgr = null; } else if (topic == "passwordmgr-storage-replace") { Task.spawn(function () { - yield this._pwmgr._storage.terminate(); + if (this._pwmgr._storage) + yield this._pwmgr._storage.terminate(); this._pwmgr._initStorage(); yield this._pwmgr.initializationPromise; Services.obs.notifyObservers(null, @@ -331,9 +348,8 @@ LoginManager.prototype = { if (logins.some(function(l) login.matches(l, true))) throw "This login already exists."; - if (!this._storage) { - throw "No storage to add login"; - } + if (!this._storage) + throw "No storage to add login"; log("Adding login"); return this._storage.addLogin(login); @@ -348,10 +364,10 @@ LoginManager.prototype = { removeLogin : function (login) { log("Removing login"); - if (!this._storage) { - log("No storage to remove login"); - return null; - } + if (!this._storage) { + log("No storage to remove login"); + return null; + } return this._storage.removeLogin(login); }, @@ -365,10 +381,10 @@ LoginManager.prototype = { modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); - if (!this._storage) { - log("No storage to modify login"); - return null; - } + if (!this._storage) { + log("No storage to modify login"); + return null; + } return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -386,10 +402,10 @@ LoginManager.prototype = { getAllLogins : function (count) { log("Getting a list of all logins"); - if (!this._storage) { - log("No storage to get all logins"); - return null; - } + if (!this._storage) { + log("No storage to get all logins"); + return null; + } return this._storage.getAllLogins(count); }, @@ -402,10 +418,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - if (!this._storage) - log("No storage to remove all logins"); - else - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -421,10 +437,10 @@ LoginManager.prototype = { getAllDisabledHosts : function (count) { log("Getting a list of all disabled hosts"); - if (!this._storage) { - log("No storage to get all disabled hosts"); - return null; - } + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } return this._storage.getAllDisabledHosts(count); }, @@ -439,10 +455,10 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) { - log("No storage to find logins"); - return null; - } + if (!this._storage) { + log("No storage to find logins"); + return null; + } return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); @@ -460,10 +476,10 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); - if (!this._storage) { - log("No storage to search logins"); - return null; - } + if (!this._storage) { + log("No storage to search logins"); + return null; + } return this._storage.searchLogins(count, matchData); }, @@ -479,8 +495,8 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) - return 0; + if (!this._storage) + return 0; return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -490,8 +506,8 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.uiBusy; }, @@ -501,8 +517,8 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.isLoggedIn; }, @@ -515,7 +531,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember || !this._storage) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -532,8 +548,8 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; - if (!this._storage) - throw "No storage to set login saving enabled"; + if (!this._storage) + throw "No storage to set login saving enabled"; log("Login saving for", hostname, "now enabled?", enabled); return this._storage.setLoginSavingEnabled(hostname, enabled);

1 0

[tor-browser/tor-browser-38.2.1esr-5.5-2] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 31 Aug '15

31 Aug '15

commit 641feb2e095bfb8bdcea91851c7be9e0c1329a26 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser-bundle/master] Bump version for Firefox commit fix.
by mikeperry＠torproject.org 27 Aug '15

27 Aug '15

commit 005158dcefdd5c7bebbbdbec3ff20e6963b37d89 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 22:32:32 2015 -0700 Bump version for Firefox commit fix. --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ac4e892..e722408 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.1esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.3

1 0

[tor-browser-bundle/maint-5.0] Bump version for 5.0.2.
by mikeperry＠torproject.org 27 Aug '15

27 Aug '15

commit 4445b60ab4834ed2652de8c008b42c4020f1fb9a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 18:50:37 2015 -0700 Bump version for 5.0.2. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index d163e28..f5e4331 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.1esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2

1 0

[tor-browser-bundle/maint-5.0] Add changelog for 5.0.2.
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit 05f550a115c934912f4553690a12e10a82f5e0a1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:32:09 2015 -0700 Add changelog for 5.0.2. --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5795e76..03e460e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 5.0.2 -- August 27 2015 + * All Platforms + * Update Firefox to 38.2.1esr + * Update NoScript to 2.6.9.36 + * Linux + * Bug 16860: Avoid duplicate icons on Unity and Gnome + Tor Browser 5.0.1 -- August 18 2015 * All Platforms * Bug 16771: Fix crash on some websites due to blob URIs

1 0

[tor-browser-bundle/maint-5.0] Bump versions for 5.0.2.
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit 5e821a73c4b6ad5f9603928704b8261fd894160b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:31:12 2015 -0700 Bump versions for 5.0.2. --- gitian/versions | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index 98238c6..d163e28 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,11 +4,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.2.0esr +FIREFOX_VERSION=38.2.1esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2 @@ -57,7 +57,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.36-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -86,7 +86,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd +NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/maint-5.0] Update update responses for 5.0.2.
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit 21ae799da7b8ade053a39a6a8d60c84878bfcc2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:31:56 2015 -0700 Update update responses for 5.0.2. --- tools/update-responses/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fd0e1ee..442e4a0 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a1 - release: 5.0.1 + release: 5.0.2 versions: - 5.0.1: - platformVersion: 38.2.0 + 5.0.2: + platformVersion: 38.2.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0.1 + download_url: https://www.torproject.org/dist/torbrowser/5.0.2 incremental_from: - - 4.5.3 - 5.0 + - 5.0.1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] List 5.5a2 in update responses
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit 973a6ac1b752b7b5c89c8e8bd08b8674486b4384 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:32:29 2015 -0700 List 5.5a2 in update responses --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fad836a..761a987 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -23,7 +23,7 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.5a1: + 5.5a2: platformVersion: 38.2.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en download_url: https://www.torproject.org/dist/torbrowser/5.5a2

1 0

[tor-browser-bundle/master] Revert "Bug 12240: Building OpenSSL reproducibly with LXC"
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit b566f9f13978874e3d27428e56d44aec19421780 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 12:44:17 2015 -0700 Revert "Bug 12240: Building OpenSSL reproducibly with LXC" This reverts commit b8633570c5ae6b2881096e318889c335c958e1c2. Reverting this to speed the rebuild process for 5.5a2. --- gitian/descriptors/mac/gitian-utils.yml | 20 +------------------- gitian/mkbundle-mac.sh | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index d457fef..c47767e 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -16,8 +16,6 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" -- "url": "https://github.com/wolfcw/libfaketime" - "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -26,7 +24,6 @@ files: - "gmp.tar.bz2" - "versions" - "dzip.sh" -- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions @@ -47,17 +44,8 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc cp *utils.zip $OUTDIR/ else - # Building libfaketime. - cd faketime - export GIT_COMMITTER_NAME="nobody" - export GIT_COMMITTER_EMAIL="nobody@localhost" - export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - git am ~/build/libfaketime.patch - make - DESTDIR="$INSTDIR/faketime" make install - export FAKETIME_SKIP_CMDS="make" + export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - cd .. sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz @@ -77,7 +65,6 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -97,15 +84,10 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - # |configure| can't cope with nano seconds faked. And even if we would revert - # that feature it would hang sometimes for unknown but to libfaketime related - # reasons. - export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 4e458bd..cf54e19 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -114,7 +114,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-bundle/master] Update update responses.
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit f38dfc3c01e109a0ee03343b270764e17282a4b3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:02:53 2015 -0700 Update update responses. --- tools/update-responses/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4d2e7cb..fad836a 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.5a1 + alpha: 5.5a2 release: 5.0 versions: 5.0: @@ -24,11 +24,11 @@ versions: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… 5.5a1: - platformVersion: 38.2.0 + platformVersion: 38.2.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.5a1 + download_url: https://www.torproject.org/dist/torbrowser/5.5a2 incremental_from: - - 5.0a4 + - 5.5a1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Bump Tor Browser and NoScript version.
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit 8df4b0ecf696712853d83944d3685c6212b249cc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:00:39 2015 -0700 Bump Tor Browser and NoScript version. --- gitian/versions.alpha | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5af64da..ac4e892 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,11 +4,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.2.0esr +FIREFOX_VERSION=38.2.1esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.3 @@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.36-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -89,7 +89,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd +NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Changelog for 5.5a2.
by mikeperry＠torproject.org 26 Aug '15

26 Aug '15

commit acc5273d78550f625c4c0abd3c70bbdd5975717e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 26 13:10:00 2015 -0700 Changelog for 5.5a2. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 032675f..083c339 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 5.5a2 -- August 26 2015 + * All Platforms: + * Update Firefox to 38.2.1esr + * Update NoScript to 2.6.9.36 + * Bug 16771: Fix crash on some websites due to blob URIs + * Linux + * Bug 16860: Avoid duplicate desktop icons on Gnome and Unity + Tor Browser 5.0.1 -- August 18 2015 * All Platforms * Bug 16771: Fix crash on some websites due to blob URIs

1 0

[tor-browser-bundle/master] Add 5.0.1 changelog
by gk＠torproject.org 26 Aug '15

26 Aug '15

commit 6a98fe33f082bc3fbe4d035725e15f666e3e85b6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 26 14:39:50 2015 +0200 Add 5.0.1 changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9296cce..032675f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 5.0.1 -- August 18 2015 + * All Platforms + * Bug 16771: Fix crash on some websites due to blob URIs + Tor Browser 5.5a1 -- August 11 2015 * All Platforms * Update Firefox to 38.2.0esr

1 0

[torbutton/master] Bug #15493: Update circuit display on new circuit info
by gk＠torproject.org 25 Aug '15

25 Aug '15

commit 1d4e0280b6dfca79bbd7e204d588dc4432832728 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 24 10:04:56 2015 -0700 Bug #15493: Update circuit display on new circuit info --- src/chrome/content/tor-circuit-display.js | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 2da7f0a..94a5346 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -123,12 +123,15 @@ let getCircuitStatusByID = function* (aController, circuitID) { return null; }; -// __collectIsolationData(aController)__. +// __collectIsolationData(aController, updateUI)__. // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then // we assume isolation settings (SOCKS username+password) are now fixed for the // corresponding circuit. Whenever the first stream on a new circuit is seen, // looks up u+p and records the node data in the credentialsToNodeDataMap. -let collectIsolationData = function (aController) { +// We need to update the circuit display immediately after any new node data +// is received. So the `updateUI` callback will be called at that point. +// See https://trac.torproject.org/projects/tor/ticket/15493 +let collectIsolationData = function (aController, updateUI) { return aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", @@ -144,6 +147,7 @@ let collectIsolationData = function (aController) { if (credentials) { let nodeData = yield nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; + updateUI(); } } }).then(null, Cu.reportError)); @@ -274,32 +278,28 @@ let updateCircuitDisplay = function () { }; // __syncDisplayWithSelectedTab(syncOn)__. -// We may have multiple tabs, but there is only one instance of TorButton's popup -// panel for displaying the Tor circuit UI. Therefore we need to update the display -// to show the currently selected tab at its current location. +// Whenever the user starts to open the popup menu, make sure the display +// is the correct one for this tab. It's also possible that a new site +// can be loaded while the popup menu is open. +// Update the display if this happens. let syncDisplayWithSelectedTab = (function() { - let listener1 = event => { updateCircuitDisplay(); }, - listener2 = { onLocationChange : function (aBrowser) { + let listener = { onLocationChange : function (aBrowser) { if (aBrowser === gBrowser.selectedBrowser) { updateCircuitDisplay(); } } }; return function (syncOn) { + let popupMenu = document.getElementById("torbutton-context-menu"); if (syncOn) { - // Whenever a different tab is selected, change the circuit display - // to show the circuit for that tab's domain. - gBrowser.tabContainer.addEventListener("TabSelect", listener1); + // Update the circuit display just before the popup menu is shown. + popupMenu.addEventListener("popupshowing", updateCircuitDisplay); // If the currently selected tab has been sent to a new location, // update the circuit to reflect that. - gBrowser.addTabsProgressListener(listener2); - // Get started with a correct display. - updateCircuitDisplay(); + gBrowser.addTabsProgressListener(listener); } else { // Stop syncing. - if (gBrowser.tabContainer) { - gBrowser.tabContainer.removeEventListener("TabSelect", listener1); - } - gBrowser.removeTabsProgressListener(listener2); + gBrowser.removeTabsProgressListener(listener); + popupMenu.removeEventListener("popupshowing", updateCircuitDisplay); // Hide the display. showCircuitDisplay(false); } @@ -333,7 +333,7 @@ let setupDisplay = function (host, port, password, enablePrefName) { stop(); }); syncDisplayWithSelectedTab(true); - stopCollectingIsolationData = collectIsolationData(myController); + stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); } }; try {

1 0

[tor-browser-bundle/maint-5.0] Bug 16860: Reuse favorite Tor Browser icon
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit a3473c7b35e83db97df1b39175c1ca4c717e9364 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 09:53:41 2015 +0200 Bug 16860: Reuse favorite Tor Browser icon Adding "StartupWMClass=Tor Browser" makes sure that the favorite Tor Browser icon is reused after Tor Browser got registered. If this property is missing one gets two icons: oe for the favorite and a new icon for the running instance. This impacts at least Gnome3. Thanks to a cypherpunk for the proposed fix. --- RelativeLink/start-tor-browser.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/RelativeLink/start-tor-browser.desktop b/RelativeLink/start-tor-browser.desktop index d6c1c63..9c63466 100755 --- a/RelativeLink/start-tor-browser.desktop +++ b/RelativeLink/start-tor-browser.desktop @@ -31,3 +31,4 @@ Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach Icon=web-browser +StartupWMClass=Tor Browser

1 0

[tor-browser-bundle/master] Bug 16860: Reuse favorite Tor Browser icon
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ee2e10d6e038b2b057499034437b4b6a393a4906 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 09:53:41 2015 +0200 Bug 16860: Reuse favorite Tor Browser icon Adding "StartupWMClass=Tor Browser" makes sure that the favorite Tor Browser icon is reused after Tor Browser got registered. If this property is missing one gets two icons: oe for the favorite and a new icon for the running instance. This impacts at least Gnome3. Thanks to a cypherpunk for the proposed fix. --- RelativeLink/start-tor-browser.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/RelativeLink/start-tor-browser.desktop b/RelativeLink/start-tor-browser.desktop index d6c1c63..9c63466 100755 --- a/RelativeLink/start-tor-browser.desktop +++ b/RelativeLink/start-tor-browser.desktop @@ -31,3 +31,4 @@ Categories=Network;WebBrowser;Security; Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach Icon=web-browser +StartupWMClass=Tor Browser

1 0

[tor-browser-bundle/maint-5.0] Bug #16866: include kvm-ok and use it on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ec4d734e654750492de727ee221bafa254754440 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 24 13:11:00 2015 +0200 Bug #16866: include kvm-ok and use it on Debian --- gitian/check-prerequisites.sh | 10 +++- tools/kvm-ok | 105 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index b36fca7..8518ffe 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -88,10 +88,16 @@ then exit 1 fi -kvm-ok > /dev/null +if [ $DISTRO = "Debian" ]; +then + kvm_ok=../tools/kvm-ok +else + kvm_ok=kvm-ok +fi +$kvm_ok > /dev/null if [ $? -ne 0 -a "z$USE_LXC" != "z1" ]; then - kvm-ok + $kvm_ok echo echo "Most likely, this means you will need to use LXC." echo diff --git a/tools/kvm-ok b/tools/kvm-ok new file mode 100755 index 0000000..5040935 --- /dev/null +++ b/tools/kvm-ok @@ -0,0 +1,105 @@ +#!/bin/sh +# +# kvm-ok - check whether the CPU we're running on supports KVM acceleration +# Copyright (C) 2008-2010 Canonical Ltd. +# +# Authors: +# Dustin Kirkland <kirkland(a)canonical.com> +# Kees Cook <kees.cook(a)canonical.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +set -e + +assert_root() { + if [ "$(id -u)" != "0" ]; then + echo "INFO: For more detailed results, you should run this as root" + echo "HINT: sudo $0" + exit 1 + fi +} + +verdict() { + # Print verdict + if [ "$1" = "0" ]; then + echo "KVM acceleration can be used" + exit 0 + else + echo "KVM acceleration can NOT be used" + exit 1 + fi +} + +# check cpu flags for capability +virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true +[ "$virt" = "vmx" ] && brand="intel" +[ "$virt" = "svm" ] && brand="amd" + +if [ -z "$virt" ]; then + echo "INFO: Your CPU does not support KVM extensions" + assert_root + verdict 1 +fi + +# Now, check that the device exists +if [ -e /dev/kvm ]; then + echo "INFO: /dev/kvm exists" + verdict 0 +else + echo "INFO: /dev/kvm does not exist" + echo "HINT: sudo modprobe kvm_$brand" +fi + +assert_root + +# Prepare MSR access +msr="/dev/cpu/0/msr" +if [ ! -r "$msr" ]; then + modprobe msr +fi +if [ ! -r "$msr" ]; then + echo "You must be root to run this check." >&2 + exit 2 +fi + +echo "INFO: Your CPU supports KVM extensions" + +disabled=0 +# check brand-specific registers +if [ "$virt" = "vmx" ]; then + BIT=$(rdmsr --bitfield 0:0 0x3a 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + # and FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX clear (no tboot) + BIT=$(rdmsr --bitfield 2:2 0x3a 2>/dev/null || true) + if [ "$BIT" = "0" ]; then + disabled=1 + fi + fi + +elif [ "$virt" = "svm" ]; then + BIT=$(rdmsr --bitfield 4:4 0xc0010114 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + disabled=1 + fi +else + echo "FAIL: Unknown virtualization extension: $virt" + verdict 1 +fi + +if [ "$disabled" -eq 1 ]; then + echo "INFO: KVM ($virt) is disabled by your BIOS" + echo "HINT: Enter your BIOS setup and enable Virtualization Technology (VT)," + echo " and then hard poweroff/poweron your system" + verdict 1 +fi + +verdict 0

1 0

[tor-browser-bundle/master] Bug #16866: include kvm-ok and use it on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ab767044c51e6455f764f0808b0f11d34534263e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Aug 24 13:11:00 2015 +0200 Bug #16866: include kvm-ok and use it on Debian --- gitian/check-prerequisites.sh | 10 +++- tools/kvm-ok | 105 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index b36fca7..8518ffe 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -88,10 +88,16 @@ then exit 1 fi -kvm-ok > /dev/null +if [ $DISTRO = "Debian" ]; +then + kvm_ok=../tools/kvm-ok +else + kvm_ok=kvm-ok +fi +$kvm_ok > /dev/null if [ $? -ne 0 -a "z$USE_LXC" != "z1" ]; then - kvm-ok + $kvm_ok echo echo "Most likely, this means you will need to use LXC." echo diff --git a/tools/kvm-ok b/tools/kvm-ok new file mode 100755 index 0000000..5040935 --- /dev/null +++ b/tools/kvm-ok @@ -0,0 +1,105 @@ +#!/bin/sh +# +# kvm-ok - check whether the CPU we're running on supports KVM acceleration +# Copyright (C) 2008-2010 Canonical Ltd. +# +# Authors: +# Dustin Kirkland <kirkland(a)canonical.com> +# Kees Cook <kees.cook(a)canonical.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +set -e + +assert_root() { + if [ "$(id -u)" != "0" ]; then + echo "INFO: For more detailed results, you should run this as root" + echo "HINT: sudo $0" + exit 1 + fi +} + +verdict() { + # Print verdict + if [ "$1" = "0" ]; then + echo "KVM acceleration can be used" + exit 0 + else + echo "KVM acceleration can NOT be used" + exit 1 + fi +} + +# check cpu flags for capability +virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true +[ "$virt" = "vmx" ] && brand="intel" +[ "$virt" = "svm" ] && brand="amd" + +if [ -z "$virt" ]; then + echo "INFO: Your CPU does not support KVM extensions" + assert_root + verdict 1 +fi + +# Now, check that the device exists +if [ -e /dev/kvm ]; then + echo "INFO: /dev/kvm exists" + verdict 0 +else + echo "INFO: /dev/kvm does not exist" + echo "HINT: sudo modprobe kvm_$brand" +fi + +assert_root + +# Prepare MSR access +msr="/dev/cpu/0/msr" +if [ ! -r "$msr" ]; then + modprobe msr +fi +if [ ! -r "$msr" ]; then + echo "You must be root to run this check." >&2 + exit 2 +fi + +echo "INFO: Your CPU supports KVM extensions" + +disabled=0 +# check brand-specific registers +if [ "$virt" = "vmx" ]; then + BIT=$(rdmsr --bitfield 0:0 0x3a 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + # and FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX clear (no tboot) + BIT=$(rdmsr --bitfield 2:2 0x3a 2>/dev/null || true) + if [ "$BIT" = "0" ]; then + disabled=1 + fi + fi + +elif [ "$virt" = "svm" ]; then + BIT=$(rdmsr --bitfield 4:4 0xc0010114 2>/dev/null || true) + if [ "$BIT" = "1" ]; then + disabled=1 + fi +else + echo "FAIL: Unknown virtualization extension: $virt" + verdict 1 +fi + +if [ "$disabled" -eq 1 ]; then + echo "INFO: KVM ($virt) is disabled by your BIOS" + echo "HINT: Enter your BIOS setup and enable Virtualization Technology (VT)," + echo " and then hard poweroff/poweron your system" + verdict 1 +fi + +verdict 0

1 0

[tor-browser-bundle/master] Bumping nightly components' versions
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit ef487bd67ac32c5e49a1f2b3c1c7ecd143a4962d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 24 11:10:50 2015 +0200 Bumping nightly components' versions --- gitian/versions.nightly | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5deba38..8d7469e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.1.0esr +FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -39,10 +39,10 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1o +OPENSSL_VER=1.0.1p GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -62,7 +62,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.31-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.36-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -86,13 +86,13 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 +OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=151339f3ba663a527b2bf7ce88a4ea1379833b7ac3b6277cdf67f6ab5a33af1b +NOSCRIPT_HASH=0585d95161711f6e4bcd56ed6f160c15bbf08ab6c559a675ce659e6c8ffb150d MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16866: the libvirtd group is called libvirt on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit e8839ca324ee90b3ca20e088f1b4ea6cdce24547 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 17:49:41 2015 +0200 Bug 16866: the libvirtd group is called libvirt on Debian --- gitian/check-prerequisites.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 93ac158..b36fca7 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -106,14 +106,20 @@ fi if [ "z$USE_LXC" != "z1" ]; then - groups | grep libvirtd > /dev/null + if [ $DISTRO = "Debian" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi + groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ]; then - echo "You need to be in the libvirtd group to run Gitian." + echo "You need to be in the $libvirt_group group to run Gitian." echo echo "Please run:" - echo " sudo adduser $USER libvirtd" - echo " newgrp libvirtd" + echo " sudo adduser $USER $libvirt_group" + echo " newgrp $libvirt_group" exit 1 fi if [ -z "$DISPLAY" ];

1 0

[tor-browser-bundle/maint-5.0] Bug 16866: the libvirtd group is called libvirt on Debian
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit a83e7a61e82c1604d0db3f2007e5a66627781c69 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 17:49:41 2015 +0200 Bug 16866: the libvirtd group is called libvirt on Debian --- gitian/check-prerequisites.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 93ac158..b36fca7 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -106,14 +106,20 @@ fi if [ "z$USE_LXC" != "z1" ]; then - groups | grep libvirtd > /dev/null + if [ $DISTRO = "Debian" ]; + then + libvirt_group=libvirt + else + libvirt_group=libvirtd + fi + groups | grep $libvirt_group > /dev/null if [ $? -ne 0 ]; then - echo "You need to be in the libvirtd group to run Gitian." + echo "You need to be in the $libvirt_group group to run Gitian." echo echo "Please run:" - echo " sudo adduser $USER libvirtd" - echo " newgrp libvirtd" + echo " sudo adduser $USER $libvirt_group" + echo " newgrp $libvirt_group" exit 1 fi if [ -z "$DISPLAY" ];

1 0

[tor-browser-bundle/maint-5.0] Bug 16875: Add boklm as an official build verifier
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit 9d83c67fff131bf76b0b993f9ebfa70704bd8975 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 14:24:24 2015 +0200 Bug 16875: Add boklm as an official build verifier --- gitian/check-match.sh | 2 +- gitian/gpg/boklm.gpg | Bin 0 -> 1706 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index e264ef3..ad12ff3 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS="linus mikeperry erinn gk" +USERS="linus mikeperry erinn gk boklm" set -e set -u diff --git a/gitian/gpg/boklm.gpg b/gitian/gpg/boklm.gpg new file mode 100644 index 0000000..5d8e1f6 Binary files /dev/null and b/gitian/gpg/boklm.gpg differ

1 0

[tor-browser-bundle/master] Bug 16875: Add boklm as an official build verifier
by gk＠torproject.org 24 Aug '15

24 Aug '15

commit 031fc5b1b4b922d63ecb1e8f27562d1126637150 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 21 14:24:24 2015 +0200 Bug 16875: Add boklm as an official build verifier --- gitian/check-match.sh | 2 +- gitian/gpg/boklm.gpg | Bin 0 -> 1706 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index e264ef3..ad12ff3 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS="linus mikeperry erinn gk" +USERS="linus mikeperry erinn gk boklm" set -e set -u diff --git a/gitian/gpg/boklm.gpg b/gitian/gpg/boklm.gpg new file mode 100644 index 0000000..5d8e1f6 Binary files /dev/null and b/gitian/gpg/boklm.gpg differ

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 1efbcfcb50459140bf7c606a85d07e73600db414 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 470b0fd685c904874254413aebdfb2de84927c47 Author: Ehsan Akhgari <ehsan(a)mozilla.com> Date: Fri Aug 7 00:15:24 2015 -0400 Bug 1192120 - Fix warnings that show up when opening the downloads window in private browsing mode; r=mconley --- browser/components/downloads/DownloadsCommon.jsm | 6 +++--- browser/components/downloads/content/contentAreaDownloadsView.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/downloads/DownloadsCommon.jsm b/browser/components/downloads/DownloadsCommon.jsm index f658db6..6376069 100644 --- a/browser/components/downloads/DownloadsCommon.jsm +++ b/browser/components/downloads/DownloadsCommon.jsm @@ -239,7 +239,7 @@ this.DownloadsCommon = { * The browser window which owns the download button. */ getData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsData; } else { return DownloadsData; @@ -261,7 +261,7 @@ this.DownloadsCommon = { * the window in question. */ getIndicatorData(aWindow) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { return PrivateDownloadsIndicatorData; } else { return DownloadsIndicatorData; @@ -279,7 +279,7 @@ this.DownloadsCommon = { * from the summary. */ getSummary(aWindow, aNumToExclude) { - if (PrivateBrowsingUtils.isWindowPrivate(aWindow)) { + if (PrivateBrowsingUtils.isContentWindowPrivate(aWindow)) { if (this._privateSummary) { return this._privateSummary; } diff --git a/browser/components/downloads/content/contentAreaDownloadsView.js b/browser/components/downloads/content/contentAreaDownloadsView.js index 15bbffd..f841f63 100644 --- a/browser/components/downloads/content/contentAreaDownloadsView.js +++ b/browser/components/downloads/content/contentAreaDownloadsView.js @@ -8,7 +8,7 @@ let ContentAreaDownloadsView = { init() { let view = new DownloadsPlacesView(document.getElementById("downloadsRichListBox")); // Do not display the Places downloads in private windows - if (!PrivateBrowsingUtils.isWindowPrivate(window)) { + if (!PrivateBrowsingUtils.isContentWindowPrivate(window)) { view.place = "place:transition=7&sort=4"; } },

1 0

[tor-browser-bundle/maint-5.0] Bug 16661: check update_responses dependencies in check-prerequisites.sh
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 9d47b46bc5299c9ba41c49ed589caeda8ae18e5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 15:40:28 2015 +0200 Bug 16661: check update_responses dependencies in check-prerequisites.sh --- gitian/check-prerequisites.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 6111125..93ac158 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -60,6 +60,23 @@ else exit 1 fi +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl" +missing_pkg='' +for pkg in $update_responses_pkg +do + if ! dpkg -s $pkg 2>/dev/null >/dev/null + then + missing_pkg="$missing_pkg $pkg" + fi +done +if [ -n "$missing_pkg" ] +then + echo "You are missing one or more dependencies for the update_responses script" + echo "Please run" + echo " sudo apt-get install $missing_pkg" + exit 1 +fi + if [ ! -f ../../gitian-builder/bin/gbuild ]; then echo "Gitian not found. You need a Gitian checkout in ../../gitian-builder"

1 0

[tor-browser-bundle/master] Bug 16661: check update_responses dependencies in check-prerequisites.sh
by gk＠torproject.org 21 Aug '15

21 Aug '15

commit 569d57637d127d4719cd3de0ba13f5430acddfd4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Aug 20 15:40:28 2015 +0200 Bug 16661: check update_responses dependencies in check-prerequisites.sh --- gitian/check-prerequisites.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index 6111125..93ac158 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -60,6 +60,23 @@ else exit 1 fi +update_responses_pkg="libyaml-perl libfile-slurp-perl libxml-writer-perl libio-captureoutput-perl libfile-which-perl libparallel-forkmanager-perl libxml-libxml-perl libwww-perl" +missing_pkg='' +for pkg in $update_responses_pkg +do + if ! dpkg -s $pkg 2>/dev/null >/dev/null + then + missing_pkg="$missing_pkg $pkg" + fi +done +if [ -n "$missing_pkg" ] +then + echo "You are missing one or more dependencies for the update_responses script" + echo "Please run" + echo " sudo apt-get install $missing_pkg" + exit 1 +fi + if [ ! -f ../../gitian-builder/bin/gbuild ]; then echo "Gitian not found. You need a Gitian checkout in ../../gitian-builder"

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 45d52ca216b12a23e83b6fdc9edcff5f49c70152 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 6803874c258b03f3fdd8cef519b6ef88185c54fa Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 11:27:22 2015 -0400 fixup! Bug #15502: Isolate blob, mediasource & mediastream URLs to first party Resurrect a workaround that allows pdf.js to save files. Fixes #16781. --- browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm index f2ac778..24c2de1 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -250,6 +250,12 @@ ChromeActions.prototype = { filename = 'document.pdf'; } var blobUri = data.blobUrl ? NetUtil.newURI(data.blobUrl) : originalUri; + var netChannel; + try { + netChannel = NetUtil.newChannel(blobUri); + } catch (e) { + netChannel = NetUtil.newChannel(originalUri); + } var extHelperAppSvc = Cc['@mozilla.org/uriloader/external-helper-app-service;1']. getService(Ci.nsIExternalHelperAppService); @@ -257,7 +263,6 @@ ChromeActions.prototype = { getService(Ci.nsIWindowWatcher).activeWindow; var docIsPrivate = this.isInPrivateBrowsing(); - var netChannel = NetUtil.newChannel(blobUri); if ('nsIPrivateBrowsingChannel' in Ci && netChannel instanceof Ci.nsIPrivateBrowsingChannel) { netChannel.setPrivate(docIsPrivate);

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 6d15c68167a45cca12ab5e7bcb8781d1de535e80 Merge: c1bde57 6803874 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:59:57 2015 +0200 Merge remote-tracking branch 'pc/bug16781-01' into tor-browser-38.2.0esr-5.5-1 browser/extensions/pdfjs/content/PdfStreamConverter.jsm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Merge remote-tracking branch 'gk/bug_16727_55' into tor-browser-38.2.0esr-5.5-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit c1bde5752a0116b2b99b061c4a3192ef13d2c100 Merge: dd8b29f 9fd1486 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:05:29 2015 +0200 Merge remote-tracking branch 'gk/bug_16727_55' into tor-browser-38.2.0esr-5.5-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 9fd14868c1c27ffbc1a966fc900d5b22273d3177 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] Merge remote-tracking branch 'gk/bug_16727_50' into tor-browser-38.2.0esr-5.0-1
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit d0fc4f07bbae57b13298be569adceb0bf4bfa455 Merge: 2cf98b3 b21e9d1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 12:03:06 2015 +0200 Merge remote-tracking branch 'gk/bug_16727_50' into tor-browser-38.2.0esr-5.0-1 browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit b21e9d1f4c199e425700083ef528209b5406dbf1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 11 13:00:05 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 16727: a localized remote page got loaded to handle the health report related transmissions and settings. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..20e2f3a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -55,6 +55,9 @@ pref("extensions.ui.lastCategory", "addons://list/extension"); pref("datareporting.healthreport.service.enabled", false); // Yes, all three of these must be set pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); +// Don't fetch a localized remote page that Tor Browser interacts with, see +// #16727. And, yes, it is "reportUrl" and not "reportURL". +pref("datareporting.healthreport.about.reportUrl", "data:text/plain,"); pref("security.mixed_content.block_active_content", false); // Disable until https://bugzilla.mozilla.org/show_bug.cgi?id=878890 is patched pref("browser.syncPromoViewsLeftMap", "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}"); // Don't promote sync pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs with other browsers

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit 2cf98b364beb59360849389c316aa2b73194eb0b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 19 13:51:11 2015 -0400 fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once Account for ESR38 login manager changes: skip storage initialization if security.nocertdb = true and set _storage to null upon failure. Fixes #16842. --- toolkit/components/passwordmgr/nsLoginManager.js | 104 +++++++++++++--------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index f2b77ac..9648f8f 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -153,9 +153,25 @@ LoginManager.prototype = { log("No alternate nsILoginManagerStorage registered"); } - this._storage = Cc[contractID]. - createInstance(Ci.nsILoginManagerStorage); - this.initializationPromise = this._storage.initialize(); + // If the security.nocertdb pref. is true, we skip initialization of + // login manager storage since we know it will fail. In this case we + // pretend that initialization succeeded in order to avoid a cascade of + // initialization errors. + if (Services.prefs.getBoolPref("security.nocertdb")) { + this._storage = null; + this.initializationPromise = Promise.resolve(); + } else { + this._storage = Cc[contractID]. + createInstance(Ci.nsILoginManagerStorage); + try { + this.initializationPromise = this._storage.initialize(); + } catch (e) { + // If storage is not available, set _storage to null so that we can + // cleanly check for a lack of storage elsewhere in this file. + this._storage = null; + this.initializationPromise = Promise.reject(e); + } + } }, @@ -196,7 +212,8 @@ LoginManager.prototype = { this._pwmgr = null; } else if (topic == "passwordmgr-storage-replace") { Task.spawn(function () { - yield this._pwmgr._storage.terminate(); + if (this._pwmgr._storage) + yield this._pwmgr._storage.terminate(); this._pwmgr._initStorage(); yield this._pwmgr.initializationPromise; Services.obs.notifyObservers(null, @@ -331,9 +348,8 @@ LoginManager.prototype = { if (logins.some(function(l) login.matches(l, true))) throw "This login already exists."; - if (!this._storage) { - throw "No storage to add login"; - } + if (!this._storage) + throw "No storage to add login"; log("Adding login"); return this._storage.addLogin(login); @@ -348,10 +364,10 @@ LoginManager.prototype = { removeLogin : function (login) { log("Removing login"); - if (!this._storage) { - log("No storage to remove login"); - return null; - } + if (!this._storage) { + log("No storage to remove login"); + return null; + } return this._storage.removeLogin(login); }, @@ -365,10 +381,10 @@ LoginManager.prototype = { modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); - if (!this._storage) { - log("No storage to modify login"); - return null; - } + if (!this._storage) { + log("No storage to modify login"); + return null; + } return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -386,10 +402,10 @@ LoginManager.prototype = { getAllLogins : function (count) { log("Getting a list of all logins"); - if (!this._storage) { - log("No storage to get all logins"); - return null; - } + if (!this._storage) { + log("No storage to get all logins"); + return null; + } return this._storage.getAllLogins(count); }, @@ -402,10 +418,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - if (!this._storage) - log("No storage to remove all logins"); - else - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -421,10 +437,10 @@ LoginManager.prototype = { getAllDisabledHosts : function (count) { log("Getting a list of all disabled hosts"); - if (!this._storage) { - log("No storage to get all disabled hosts"); - return null; - } + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } return this._storage.getAllDisabledHosts(count); }, @@ -439,10 +455,10 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) { - log("No storage to find logins"); - return null; - } + if (!this._storage) { + log("No storage to find logins"); + return null; + } return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); @@ -460,10 +476,10 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); - if (!this._storage) { - log("No storage to search logins"); - return null; - } + if (!this._storage) { + log("No storage to search logins"); + return null; + } return this._storage.searchLogins(count, matchData); }, @@ -479,8 +495,8 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) - return 0; + if (!this._storage) + return 0; return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -490,8 +506,8 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.uiBusy; }, @@ -501,8 +517,8 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.isLoggedIn; }, @@ -515,7 +531,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember || !this._storage) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -532,8 +548,8 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; - if (!this._storage) - throw "No storage to set login saving enabled"; + if (!this._storage) + throw "No storage to set login saving enabled"; log("Login saving for", hostname, "now enabled?", enabled); return this._storage.setLoginSavingEnabled(hostname, enabled);

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once
by gk＠torproject.org 20 Aug '15

20 Aug '15

commit dd8b29f3db500ab7586a25f2bdfa5b2af7c88607 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 19 13:51:11 2015 -0400 fixup! Bug 14716: HTTP Basic Authentication prompt only displayed once Account for ESR38 login manager changes: skip storage initialization if security.nocertdb = true and set _storage to null upon failure. Fixes #16842. --- toolkit/components/passwordmgr/nsLoginManager.js | 104 +++++++++++++--------- 1 file changed, 60 insertions(+), 44 deletions(-) diff --git a/toolkit/components/passwordmgr/nsLoginManager.js b/toolkit/components/passwordmgr/nsLoginManager.js index f2b77ac..9648f8f 100644 --- a/toolkit/components/passwordmgr/nsLoginManager.js +++ b/toolkit/components/passwordmgr/nsLoginManager.js @@ -153,9 +153,25 @@ LoginManager.prototype = { log("No alternate nsILoginManagerStorage registered"); } - this._storage = Cc[contractID]. - createInstance(Ci.nsILoginManagerStorage); - this.initializationPromise = this._storage.initialize(); + // If the security.nocertdb pref. is true, we skip initialization of + // login manager storage since we know it will fail. In this case we + // pretend that initialization succeeded in order to avoid a cascade of + // initialization errors. + if (Services.prefs.getBoolPref("security.nocertdb")) { + this._storage = null; + this.initializationPromise = Promise.resolve(); + } else { + this._storage = Cc[contractID]. + createInstance(Ci.nsILoginManagerStorage); + try { + this.initializationPromise = this._storage.initialize(); + } catch (e) { + // If storage is not available, set _storage to null so that we can + // cleanly check for a lack of storage elsewhere in this file. + this._storage = null; + this.initializationPromise = Promise.reject(e); + } + } }, @@ -196,7 +212,8 @@ LoginManager.prototype = { this._pwmgr = null; } else if (topic == "passwordmgr-storage-replace") { Task.spawn(function () { - yield this._pwmgr._storage.terminate(); + if (this._pwmgr._storage) + yield this._pwmgr._storage.terminate(); this._pwmgr._initStorage(); yield this._pwmgr.initializationPromise; Services.obs.notifyObservers(null, @@ -331,9 +348,8 @@ LoginManager.prototype = { if (logins.some(function(l) login.matches(l, true))) throw "This login already exists."; - if (!this._storage) { - throw "No storage to add login"; - } + if (!this._storage) + throw "No storage to add login"; log("Adding login"); return this._storage.addLogin(login); @@ -348,10 +364,10 @@ LoginManager.prototype = { removeLogin : function (login) { log("Removing login"); - if (!this._storage) { - log("No storage to remove login"); - return null; - } + if (!this._storage) { + log("No storage to remove login"); + return null; + } return this._storage.removeLogin(login); }, @@ -365,10 +381,10 @@ LoginManager.prototype = { modifyLogin : function (oldLogin, newLogin) { log("Modifying login"); - if (!this._storage) { - log("No storage to modify login"); - return null; - } + if (!this._storage) { + log("No storage to modify login"); + return null; + } return this._storage.modifyLogin(oldLogin, newLogin); }, @@ -386,10 +402,10 @@ LoginManager.prototype = { getAllLogins : function (count) { log("Getting a list of all logins"); - if (!this._storage) { - log("No storage to get all logins"); - return null; - } + if (!this._storage) { + log("No storage to get all logins"); + return null; + } return this._storage.getAllLogins(count); }, @@ -402,10 +418,10 @@ LoginManager.prototype = { */ removeAllLogins : function () { log("Removing all logins"); - if (!this._storage) - log("No storage to remove all logins"); - else - this._storage.removeAllLogins(); + if (!this._storage) + log("No storage to remove all logins"); + else + this._storage.removeAllLogins(); }, /* @@ -421,10 +437,10 @@ LoginManager.prototype = { getAllDisabledHosts : function (count) { log("Getting a list of all disabled hosts"); - if (!this._storage) { - log("No storage to get all disabled hosts"); - return null; - } + if (!this._storage) { + log("No storage to get all disabled hosts"); + return null; + } return this._storage.getAllDisabledHosts(count); }, @@ -439,10 +455,10 @@ LoginManager.prototype = { log("Searching for logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) { - log("No storage to find logins"); - return null; - } + if (!this._storage) { + log("No storage to find logins"); + return null; + } return this._storage.findLogins(count, hostname, formSubmitURL, httpRealm); @@ -460,10 +476,10 @@ LoginManager.prototype = { searchLogins : function(count, matchData) { log("Searching for logins"); - if (!this._storage) { - log("No storage to search logins"); - return null; - } + if (!this._storage) { + log("No storage to search logins"); + return null; + } return this._storage.searchLogins(count, matchData); }, @@ -479,8 +495,8 @@ LoginManager.prototype = { log("Counting logins matching host:", hostname, "formSubmitURL:", formSubmitURL, "httpRealm:", httpRealm); - if (!this._storage) - return 0; + if (!this._storage) + return 0; return this._storage.countLogins(hostname, formSubmitURL, httpRealm); }, @@ -490,8 +506,8 @@ LoginManager.prototype = { * uiBusy */ get uiBusy() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.uiBusy; }, @@ -501,8 +517,8 @@ LoginManager.prototype = { * isLoggedIn */ get isLoggedIn() { - if (!this._storage) - return false; + if (!this._storage) + return false; return this._storage.isLoggedIn; }, @@ -515,7 +531,7 @@ LoginManager.prototype = { */ getLoginSavingEnabled : function (host) { log("Checking if logins to", host, "can be saved."); - if (!this._remember || !this._storage) + if (!this._remember || !this._storage) return false; return this._storage.getLoginSavingEnabled(host); @@ -532,8 +548,8 @@ LoginManager.prototype = { if (hostname.indexOf("\0") != -1) throw "Invalid hostname"; - if (!this._storage) - throw "No storage to set login saving enabled"; + if (!this._storage) + throw "No storage to set login saving enabled"; log("Login saving for", hostname, "now enabled?", enabled); return this._storage.setLoginSavingEnabled(hostname, enabled);

1 0

[tor-browser-bundle/master] Bug 12240: Building OpenSSL reproducibly with LXC
by gk＠torproject.org 19 Aug '15

19 Aug '15

commit b8633570c5ae6b2881096e318889c335c958e1c2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 17 13:32:58 2015 +0200 Bug 12240: Building OpenSSL reproducibly with LXC --- gitian/descriptors/mac/gitian-utils.yml | 20 +++++++++++++++++++- gitian/mkbundle-mac.sh | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index c47767e..d457fef 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -16,6 +16,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -24,6 +26,7 @@ files: - "gmp.tar.bz2" - "versions" - "dzip.sh" +- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions @@ -44,8 +47,17 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc cp *utils.zip $OUTDIR/ else - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Building libfaketime. + cd faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" export FAKETIME=$REFERENCE_DATETIME + cd .. sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz @@ -65,6 +77,7 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -84,10 +97,15 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index cf54e19..4e458bd 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -114,7 +114,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0

[torbutton/master] Bug 16797: brandShorterName is missing from brand.properties.
by gk＠torproject.org 19 Aug '15

19 Aug '15

commit 71a0bba47c0d2d079b778cd2763a27c90d664420 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 13 14:37:42 2015 -0400 Bug 16797: brandShorterName is missing from brand.properties. Adding this fixes problems such as the lack of "Tor Browser" in the left side of the URL bar for pages such as about:config. --- src/chrome/locale/en/brand.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en/brand.properties index f63def3..732c157 100644 --- a/src/chrome/locale/en/brand.properties +++ b/src/chrome/locale/en/brand.properties @@ -2,6 +2,7 @@ # 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/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by mikeperry＠torproject.org 16 Aug '15

16 Aug '15

commit b5ded517ea69201328825c95785200cb1c5bb829 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 12 12:26:34 2015 -0700 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party --- dom/base/nsHostObjectProtocolHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/base/nsHostObjectProtocolHandler.cpp b/dom/base/nsHostObjectProtocolHandler.cpp index 429938b..114b45c 100644 --- a/dom/base/nsHostObjectProtocolHandler.cpp +++ b/dom/base/nsHostObjectProtocolHandler.cpp @@ -351,7 +351,7 @@ nsHostObjectProtocolHandler::RemoveDataEntry(const nsACString& aUri, { if (gDataTable) { DataInfo* info = GetDataInfo(aUri); - if (info->mFirstPartyHost == aIsolationKey) { + if (info && info->mFirstPartyHost == aIsolationKey) { nsCString uriIgnoringRef; int32_t hashPos = aUri.FindChar('#'); if (hashPos < 0) {

1 0

[tor-browser-bundle/maint-5.0] Bump versions for 5.0.1.
by mikeperry＠torproject.org 16 Aug '15

16 Aug '15

commit 1eaebdd5a59a1ba22e3001aecc4329720a5255a2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 16 14:06:53 2015 -0700 Bump versions for 5.0.1. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 2 +- tools/update-responses/config.yml | 7 ++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 10fc5a1..5795e76 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 5.0.1 -- August 18 2015 + * All Platforms + * Bug 16771: Fix crash on some websites due to blob URIs + Tor Browser 5.5a1 -- August 11 2015 * All Platforms * Update Firefox to 38.2.0esr diff --git a/gitian/versions b/gitian/versions index 6b6f290..98238c6 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 4d2e7cb..fd0e1ee 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a1 - release: 5.0 + release: 5.0.1 versions: - 5.0: + 5.0.1: platformVersion: 38.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0 + download_url: https://www.torproject.org/dist/torbrowser/5.0.1 incremental_from: - 4.5.3 + - 5.0 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party
by mikeperry＠torproject.org 16 Aug '15

16 Aug '15

commit 52e988762c262920f52a7f4b9b89c64f04da3c4c Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 12 12:26:34 2015 -0700 fixup! Bug #15502. Isolate blob, mediasource & mediastream URLs to first party --- dom/base/nsHostObjectProtocolHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/base/nsHostObjectProtocolHandler.cpp b/dom/base/nsHostObjectProtocolHandler.cpp index 429938b..114b45c 100644 --- a/dom/base/nsHostObjectProtocolHandler.cpp +++ b/dom/base/nsHostObjectProtocolHandler.cpp @@ -351,7 +351,7 @@ nsHostObjectProtocolHandler::RemoveDataEntry(const nsACString& aUri, { if (gDataTable) { DataInfo* info = GetDataInfo(aUri); - if (info->mFirstPartyHost == aIsolationKey) { + if (info && info->mFirstPartyHost == aIsolationKey) { nsCString uriIgnoringRef; int32_t hashPos = aUri.FindChar('#'); if (hashPos < 0) {

1 0

[tor-browser-bundle/master] Update versions for new tags.
by mikeperry＠torproject.org 09 Aug '15

09 Aug '15

commit acd76a4b3e9c32ddcf5c7554f9859011b7ba1d9a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 9 15:06:30 2015 -0700 Update versions for new tags. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index ebed0e0..671b500 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 27e4e65..5af64da 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.3

1 0

[tor-browser-bundle/maint-5.0] Update browser tag for locale fix.
by mikeperry＠torproject.org 09 Aug '15

09 Aug '15

commit 1ac3f90a4b7c85afa70318203bc07f574148dcd2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 9 15:07:37 2015 -0700 Update browser tag for locale fix. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 25501ad..6b6f290 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build2 TOR_TAG=tor-0.2.6.10 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.2

1 0

[tor-browser/tor-browser-38.2.0esr-5.0-1] Bug 10895: Fix versioning for langpacks.
by mikeperry＠torproject.org 09 Aug '15

09 Aug '15

commit ebcbfd6cdc29372909079d0345185733d47d90d4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 9 14:59:20 2015 -0700 Bug 10895: Fix versioning for langpacks. --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 338f40f..0dc0e7f 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -38.2.0esrpre +38.2.0 diff --git a/config/milestone.txt b/config/milestone.txt index 08bba88..ac4d65e 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -38.2.0esrpre +38.2.0

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] Bug 10895: Fix versioning for langpacks.
by mikeperry＠torproject.org 09 Aug '15

09 Aug '15

commit 306f1e1cd8950c5ee43df0862e296cfd398a2eed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Aug 9 14:59:20 2015 -0700 Bug 10895: Fix versioning for langpacks. --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 338f40f..0dc0e7f 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -38.2.0esrpre +38.2.0 diff --git a/config/milestone.txt b/config/milestone.txt index 08bba88..ac4d65e 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -38.2.0esrpre +38.2.0

1 0

[tor-browser-bundle/master] Update Noto font lists for bundles.
by mikeperry＠torproject.org 08 Aug '15

08 Aug '15

commit 2071c2e15c8b4108bdf4c1c368d91ffdfcab4230 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Aug 6 17:22:21 2015 -0700 Update Noto font lists for bundles. --- gitian/descriptors/linux/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 819a1de..f1d0554 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -123,7 +123,7 @@ script: | # # Install fonts. mkdir -p tor-browser/Browser/fonts - NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="Arimo-Regular.ttf Arimo-Bold.ttf Arimo-Italic.ttf Arimo-BoldItalic.ttf Cousine-Regular.ttf Tinos-Regular.ttf Tinos-Bold.ttf Tinos-Italic.ttf Tinos-BoldItalic.ttf NotoNaskhArabic-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" for fontfile in $NOTO_FONTS_HINTED; do cp "noto-fonts/hinted/$fontfile" tor-browser/Browser/fonts/ done diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 9b38d0f..a956fa7 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -126,7 +126,7 @@ script: | # # Install fonts. mkdir -p $TORBROWSER_NAME.app/Contents/Resources/fonts - NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="NotoNaskhArabic-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" for fontfile in $NOTO_FONTS_HINTED; do cp "noto-fonts/hinted/$fontfile" $TORBROWSER_NAME.app/Contents/Resources/fonts/ done diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 02a3816..c674e1b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -115,7 +115,7 @@ script: | # # Install fonts. mkdir -p tbb-windows-installer/"Tor Browser"/Browser/fonts - NOTO_FONTS_HINTED="Cousine-Regular.ttf NotoKufiArabic-Regular.ttf NotoNaskhArabic-Regular.ttf NotoSans-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerif-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" + NOTO_FONTS_HINTED="NotoNaskhArabic-Regular.ttf NotoSansArmenian-Regular.ttf NotoSansBengali-Regular.ttf NotoSansDevanagari-Regular.ttf NotoSansEthiopic-Regular.ttf NotoSansGeorgian-Regular.ttf NotoSansGujarati-Regular.ttf NotoSansGurmukhi-Regular.ttf NotoSansHebrew-Regular.ttf NotoSansKannada-Regular.ttf NotoSansKhmer-Regular.ttf NotoSansLao-Regular.ttf NotoSansMalayalam-Regular.ttf NotoSansMyanmar-Regular.ttf NotoSansOriya-Regular.ttf NotoSansSinhala-Regular.ttf NotoSansTamil-Regular.ttf NotoSansTelugu-Regular.ttf NotoSansThaana-Regular.ttf NotoSansThai-Regular.ttf NotoSansTibetan-Regular.ttf NotoSerifArmenian-Regular.ttf NotoSerifKhmer-Regular.ttf NotoSerifLao-Regular.ttf NotoSerifThai-Regular.ttf" for fontfile in $NOTO_FONTS_HINTED; do cp "noto-fonts/hinted/$fontfile" tbb-windows-installer/"Tor Browser"/Browser/fonts/ done

1 0

[tor-browser-bundle/master] Remove the fallback conf.d line from fonts.conf.
by mikeperry＠torproject.org 08 Aug '15

08 Aug '15

commit 30dfe9f180659a5a841abfa737581ea3a9f31356 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Aug 8 13:48:27 2015 -0700 Remove the fallback conf.d line from fonts.conf. Doesn't solve all the issues in #16672, but seems to prevent reading the system config dir, at least. --- Bundle-Data/linux/Data/fontconfig/fonts.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Bundle-Data/linux/Data/fontconfig/fonts.conf b/Bundle-Data/linux/Data/fontconfig/fonts.conf index 92b8aa3..ed236ac 100644 --- a/Bundle-Data/linux/Data/fontconfig/fonts.conf +++ b/Bundle-Data/linux/Data/fontconfig/fonts.conf @@ -72,11 +72,6 @@ PERFORMANCE OF THIS SOFTWARE. </edit> </match> - - <include ignore_missing="yes">conf.d</include> -  <cachedir prefix="xdg">fontconfig</cachedir>

1 0

[tor-browser-bundle/master] Install a Fontconfig configuration for linux.
by mikeperry＠torproject.org 08 Aug '15

08 Aug '15

commit b88443f6d8af62f763b069eb15e008a46d9b468a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Sep 30 07:19:21 2014 +0000 Install a Fontconfig configuration for linux. It limits font selection to those font files found in the Browser/fonts directory, and standardizes settings such as hinting and antialiasing. --- Bundle-Data/linux/Data/fontconfig/fonts.conf | 168 ++++++++++++++++++++++++++ RelativeLink/start-tor-browser | 4 + 2 files changed, 172 insertions(+) diff --git a/Bundle-Data/linux/Data/fontconfig/fonts.conf b/Bundle-Data/linux/Data/fontconfig/fonts.conf new file mode 100644 index 0000000..92b8aa3 --- /dev/null +++ b/Bundle-Data/linux/Data/fontconfig/fonts.conf @@ -0,0 +1,168 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> + + +<fontconfig> + + + + <dir>fonts</dir> + + + <match target="pattern"> + <test qual="any" name="family"> + <string>mono</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>monospace</string> + </edit> + </match> + + + <match target="pattern"> + <test qual="any" name="family"> + <string>sans serif</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>sans-serif</string> + </edit> + </match> + + + <match target="pattern"> + <test qual="any" name="family"> + <string>sans</string> + </test> + <edit name="family" mode="assign" binding="same"> + <string>sans-serif</string> + </edit> + </match> + + + <include ignore_missing="yes">conf.d</include> + + + + <cachedir prefix="xdg">fontconfig</cachedir> + + <config> + + <blank> + <int>0x0020</int>  + <int>0x00A0</int>  + <int>0x00AD</int>  + <int>0x034F</int>  + <int>0x0600</int>  + <int>0x0601</int>  + <int>0x0602</int>  + <int>0x0603</int>  + <int>0x06DD</int>  + <int>0x070F</int>  + <int>0x115F</int>  + <int>0x1160</int>  + <int>0x1680</int>  + <int>0x17B4</int>  + <int>0x17B5</int>  + <int>0x180E</int>  + <int>0x2000</int>  + <int>0x2001</int>  + <int>0x2002</int>  + <int>0x2003</int>  + <int>0x2004</int>  + <int>0x2005</int>  + <int>0x2006</int>  + <int>0x2007</int>  + <int>0x2008</int>  + <int>0x2009</int>  + <int>0x200A</int>  + <int>0x200B</int>  + <int>0x200C</int>  + <int>0x200D</int>  + <int>0x200E</int>  + <int>0x200F</int>  + <int>0x2028</int>  + <int>0x2029</int>  + <int>0x202A</int>  + <int>0x202B</int>  + <int>0x202C</int>  + <int>0x202D</int>  + <int>0x202E</int>  + <int>0x202F</int>  + <int>0x205F</int>  + <int>0x2060</int>  + <int>0x2061</int>  + <int>0x2062</int>  + <int>0x2063</int>  + <int>0x206A</int>  + <int>0x206B</int>  + <int>0x206C</int>  + <int>0x206D</int>  + <int>0x206E</int>  + <int>0x206F</int>  + <int>0x2800</int>  + <int>0x3000</int>  + <int>0x3164</int>  + <int>0xFEFF</int>  + <int>0xFFA0</int>  + <int>0xFFF9</int>  + <int>0xFFFA</int>  + <int>0xFFFB</int>  + </blank> + + <rescan> + <int>30</int> + </rescan> + </config> + +  + <match target="pattern"> + <edit name="antialias" mode="assign"><bool>true</bool></edit> + <edit name="autohint" mode="assign"><bool>false</bool></edit> + <edit name="hinting" mode="assign"><bool>true</bool></edit> + <edit name="hintstyle" mode="assign"><const>hintfull</const></edit> + <edit name="lcdfilter" mode="assign"><const>lcddefault</const></edit> + <edit name="rgba" mode="assign"><const>none</const></edit> + </match> +</fontconfig> diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 638c0c0..f556389 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -340,6 +340,10 @@ EOF # your password in the following line where the word “secret” is: setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} +# Set up custom bundled fonts. See fonts-conf(5). +export FONTCONFIG_PATH="${HOME}/TorBrowser/Data/fontconfig" +export FONTCONFIG_FILE="fonts.conf" + cd "${HOME}" # We pass all additional command-line arguments we get to Firefox.

1 0

[tor-browser-bundle/master] Update changelog + tag for #16672.
by mikeperry＠torproject.org 08 Aug '15

08 Aug '15

commit dd642b664e21a90d52fbc19689e9c44efd471392 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Aug 8 13:53:25 2015 -0700 Update changelog + tag for #16672. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 10fc5a1..9296cce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -16,6 +16,7 @@ Tor Browser 5.5a1 -- August 11 2015 * Bug 16572: Verify cache isolation for XMLHttpRequests in Web Workers * Bug 16311: Fix navigation timing in ESR 38 * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup) + * Bug 16672: Change font whitelists and configs for rendering issues (partial) Tor Browser 5.0 -- August 11 2015 * All Platforms diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 840e8b9..27e4e65 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,7 +8,7 @@ FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build2 TOR_TAG=tor-0.2.7.2-alpha TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.3.3

1 0

[tor-browser/tor-browser-38.2.0esr-5.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 08 Aug '15

08 Aug '15

commit d9ac9f768a4ff03f2f95db452e3c33f78ae834b9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 5 17:42:10 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Update font whitelists for #16672. --- browser/app/profile/000-tor-browser.js | 247 +++++++++++++++++--------------- 1 file changed, 129 insertions(+), 118 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 6bc98d0..f21a564 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -240,119 +240,130 @@ pref("security.cert_pinning.enforcement_level", 2); #endif // If we are bundling fonts, only allow bundled fonts to be used. + #ifdef MOZ_BUNDLED_FONTS + +#ifdef XP_MACOSX +pref("font.system.whitelist", "Courier, Georgia, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +#endif + +#ifdef XP_WIN +pref("font.system.whitelist", "Courier New, Georgia, Arial, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +#endif + +#ifdef XP_LINUX +pref("font.system.whitelist", "Arimo, Arimo Bold, Arimo Italic, Arimo Bold Italic, Cousine, Tinos, Tinos Bold, Tinos Italic, Tinos Bold Italic, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +#endif + pref("font.default.lo", "Noto Sans Lao"); pref("font.default.my", "Noto Sans Myanmar"); pref("font.default.x-western", "sans-serif"); -pref("font.internaluseonly.changed", true); -pref("font.name-list.cursive.ar", "Noto Naskh Arabic"); -pref("font.name-list.cursive.el", "Noto Serif"); -pref("font.name-list.cursive.he", "Noto Sans Hebrew"); -pref("font.name-list.cursive.x-cyrillic", "Noto Serif"); -pref("font.name-list.cursive.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); -pref("font.name-list.cursive.x-western", "Noto Serif"); -pref("font.name-list.fantasy.ar", "Noto Kufi Arabic"); -pref("font.name-list.fantasy.el", "Noto Serif"); -pref("font.name-list.fantasy.he", "Noto Sans Hebrew"); -pref("font.name-list.fantasy.x-cyrillic", "Noto Serif"); -pref("font.name-list.fantasy.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao\, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); -pref("font.name-list.fantasy.x-western", "Noto Serif"); -pref("font.name-list.monospace.ar", "Noto Kufi Arabic"); -pref("font.name-list.monospace.el", "Cousine"); -pref("font.name-list.monospace.he", "Noto Sans Hebrew"); -pref("font.name-list.monospace.ja", "Noto Sans CJK SC Regular"); -pref("font.name-list.monospace.ko", "Noto Sans CJK SC Regular"); -pref("font.name-list.monospace.th", "Noto Sans Thai"); -pref("font.name-list.monospace.x-armn", "Noto Sans Armenian"); -pref("font.name-list.monospace.x-beng", "Noto Sans Bengali"); -pref("font.name-list.monospace.x-cyrillic", "Cousine"); -pref("font.name-list.monospace.x-devanagari", "Noto Sans Devanagari"); -pref("font.name-list.monospace.x-ethi", "Noto Sans Ethiopic"); -pref("font.name-list.monospace.x-geor", "Noto Sans Georgian"); -pref("font.name-list.monospace.x-gujr", "Noto Sans Gujarati"); -pref("font.name-list.monospace.x-guru", "Noto Sans Gurmukhi"); -pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer"); -pref("font.name-list.monospace.x-knda", "Noto Sans Kannada"); -pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam"); -pref("font.name-list.monospace.x-orya", "Noto Sans Oriya"); -pref("font.name-list.monospace.x-sinh", "Noto Sans Sinhala"); -pref("font.name-list.monospace.x-tamil", "Noto Sans Tamil"); -pref("font.name-list.monospace.x-telu", "Noto Sans Telugu"); -pref("font.name-list.monospace.x-tibt", "Noto Sans Tibetan"); -pref("font.name-list.monospace.x-unicode", "Cousine, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); -pref("font.name-list.monospace.x-western", "Cousine"); -pref("font.name-list.monospace.zh-CN", "Noto Sans CJK SC Regular"); -pref("font.name-list.monospace.zh-HK", "Noto Sans CJK SC Regular"); -pref("font.name-list.monospace.zh-TW", "Noto Sans CJK SC Regular"); -pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic"); -pref("font.name-list.sans-serif.el", "Noto Sans"); -pref("font.name-list.sans-serif.he", "Noto Sans Hebrew"); -pref("font.name-list.sans-serif.ja", "Noto Sans CJK SC Regular"); -pref("font.name-list.sans-serif.ko", "Noto Sans CJK SC Regular"); -pref("font.name-list.sans-serif.th", "Noto Sans Thai"); -pref("font.name-list.sans-serif.x-armn", "Noto Sans Armenian"); -pref("font.name-list.sans-serif.x-beng", "Noto Sans Bengali"); -pref("font.name-list.sans-serif.x-cyrillic", "Noto Sans"); -pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari"); -pref("font.name-list.sans-serif.x-ethi", "Noto Sans Ethiopic"); -pref("font.name-list.sans-serif.x-geor", "Noto Sans Georgian"); -pref("font.name-list.sans-serif.x-gujr", "Noto Sans Gujarati"); -pref("font.name-list.sans-serif.x-guru", "Noto Sans Gurmukhi"); -pref("font.name-list.sans-serif.x-khmr", "Noto Sans Khmer"); -pref("font.name-list.sans-serif.x-knda", "Noto Sans Kannada"); -pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam"); -pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya"); -pref("font.name-list.sans-serif.x-sinh", "Noto Sans Sinhala"); -pref("font.name-list.sans-serif.x-tamil", "Noto Sans Tamil"); -pref("font.name-list.sans-serif.x-telu", "Noto Sans Telugu"); -pref("font.name-list.sans-serif.x-tibt", "Noto Sans Tibetan"); -pref("font.name-list.sans-serif.x-unicode", "Noto Sans, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Serif Lao"); -pref("font.name-list.sans-serif.x-western", "Noto Sans"); -pref("font.name-list.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); -pref("font.name-list.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); -pref("font.name-list.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); -pref("font.name-list.serif.ar", "Noto Naskh Arabic"); -pref("font.name-list.serif.el", "Noto Serif"); -pref("font.name-list.serif.he", "Noto Sans Hebrew"); -pref("font.name-list.serif.ja", "Noto Sans CJK SC Regular"); -pref("font.name-list.serif.ko", "Noto Sans CJK SC Regular"); -pref("font.name-list.serif.th", "Noto Sans Thai"); -pref("font.name-list.serif.th", "Noto Serif Thai"); -pref("font.name-list.serif.x-armn", "Noto Serif Armenian"); -pref("font.name-list.serif.x-beng", "Noto Sans Bengali"); -pref("font.name-list.serif.x-cyrillic", "Noto Serif"); -pref("font.name-list.serif.x-devanagari", "Noto Sans Devanagari"); -pref("font.name-list.serif.x-ethi", "Noto Sans Ethiopic"); -pref("font.name-list.serif.x-geor", "Noto Sans Georgian"); -pref("font.name-list.serif.x-gujr", "Noto Sans Gujarati"); -pref("font.name-list.serif.x-guru", "Noto Sans Gurmukhi"); -pref("font.name-list.serif.x-khmr", "Noto Serif Khmer"); -pref("font.name-list.serif.x-knda", "Noto Sans Kannada"); -pref("font.name-list.serif.x-mlym", "Noto Sans Malayalam"); -pref("font.name-list.serif.x-orya", "Noto Sans Oriya"); -pref("font.name-list.serif.x-sinh", "Noto Sans Sinhala"); -pref("font.name-list.serif.x-tamil", "Noto Sans Tamil"); -pref("font.name-list.serif.x-telu", "Noto Sans Telugu"); -pref("font.name-list.serif.x-tibt", "Noto Sans Tibetan"); -pref("font.name-list.serif.x-unicode", "Noto Serif, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Mongolian, Noto Sans Thaana, Noto Sans Yi, Noto Serif Lao"); -pref("font.name-list.serif.x-western", "Noto Serif"); -pref("font.name-list.serif.zh-CN", "Noto Sans CJK SC Regular"); -pref("font.name-list.serif.zh-HK", "Noto Sans CJK SC Regular"); -pref("font.name-list.serif.zh-TW", "Noto Sans CJK SC Regular"); +pref("font.name-list.cursive.ar", "Noto Naskh Arabic, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.cursive.he", "Noto Sans Hebrew, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.cursive.x-cyrillic", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.cursive.x-unicode", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.cursive.x-western", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.fantasy.ar", "Noto Naskh Arabic, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.fantasy.el", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.fantasy.he", "Noto Sans Hebrew, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.fantasy.x-cyrillic", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.fantasy.x-unicode", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.fantasy.x-western", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.ar", "Noto Naskh Arabic, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.el", "Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.he", "Noto Sans Hebrew, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.ja", "Noto Sans CJK SC Regular, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.ko", "Noto Sans CJK SC Regular, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.th", "Noto Sans Thai, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-armn", "Noto Sans Armenian, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-beng", "Noto Sans Bengali, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-cyrillic", "Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-devanagari", "Noto Sans Devanagari, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-ethi", "Noto Sans Ethiopic, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-geor", "Noto Sans Georgian, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-gujr", "Noto Sans Gujarati, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-guru", "Noto Sans Gurmukhi, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-khmr", "Noto Sans Khmer, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-knda", "Noto Sans Kannada, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-mlym", "Noto Sans Malayalam, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-orya", "Noto Sans Oriya, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-sinh", "Noto Sans Sinhala, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-tamil", "Noto Sans Tamil, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-telu", "Noto Sans Telugu, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-tibt", "Noto Sans Tibetan, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-unicode", "Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.x-western", "Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.zh-CN", "Noto Sans CJK SC Regular, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.zh-HK", "Noto Sans CJK SC Regular, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.monospace.zh-TW", "Noto Sans CJK SC Regular, Cousine, Courier, Courier New, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.ar", "Noto Naskh Arabic, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.el", "Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.he", "Noto Sans Hebrew, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.ja", "Noto Sans CJK SC Regular, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.ko", "Noto Sans CJK SC Regular, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.th", "Noto Sans Thai, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-armn", "Noto Sans Armenian, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-beng", "Noto Sans Bengali, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-cyrillic", "Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-devanagari", "Noto Sans Devanagari, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-ethi", "Noto Sans Ethiopic, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-geor", "Noto Sans Georgian, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-gujr", "Noto Sans Gujarati, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-guru", "Noto Sans Gurmukhi, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-khmr", "Noto Sans Khmer, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-knda", "Noto Sans Kannada, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-mlym", "Noto Sans Malayalam, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-orya", "Noto Sans Oriya, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-sinh", "Noto Sans Sinhala, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-tamil", "Noto Sans Tamil, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-telu", "Noto Sans Telugu, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-tibt", "Noto Sans Tibetan, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-unicode", "Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.x-western", "Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.zh-CN", "Noto Sans CJK SC Regular, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.zh-HK", "Noto Sans CJK SC Regular, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.sans-serif.zh-TW", "Noto Sans CJK SC Regular, Arimo, Arial, Verdana, Noto Naskh Arabic, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.ar", "Noto Naskh Arabic, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.el", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.he", "Tinos, Georgia, Noto Sans Hebrew, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.ja", "Noto Sans CJK SC Regular, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.ko", "Noto Sans CJK SC Regular, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.th", "Noto Serif Thai, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-armn", "Noto Serif Armenian, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-beng", "Noto Sans Bengali, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-cyrillic", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-devanagari", "Noto Sans Devanagari, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-ethi", "Noto Sans Ethiopic, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-geor", "Noto Sans Georgian, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-gujr", "Noto Sans Gujarati, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-guru", "Noto Sans Gurmukhi, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-khmr", "Noto Serif Khmer, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-knda", "Noto Sans Kannada, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-mlym", "Noto Sans Malayalam, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-orya", "Noto Sans Oriya, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-sinh", "Noto Sans Sinhala, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-tamil", "Noto Sans Tamil, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-telu", "Noto Sans Telugu, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-tibt", "Noto Sans Tibetan, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-unicode", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.x-western", "Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.zh-CN", "Noto Sans CJK SC Regular, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.zh-HK", "Noto Sans CJK SC Regular, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); +pref("font.name-list.serif.zh-TW", "Noto Sans CJK SC Regular, Tinos, Georgia, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); pref("font.name.cursive.ar", "Noto Naskh Arabic"); -pref("font.name.cursive.el", "Noto Serif"); +pref("font.name.cursive.el", "Tinos, Georgia"); pref("font.name.cursive.he", "Noto Sans Hebrew"); -pref("font.name.cursive.x-cyrillic", "Noto Serif"); -pref("font.name.cursive.x-unicode", "Noto Serif"); -pref("font.name.cursive.x-western", "Noto Serif"); -pref("font.name.fantasy.ar", "Noto Kufi Arabic"); -pref("font.name.fantasy.el", "Noto Serif"); +pref("font.name.cursive.x-cyrillic", "Tinos, Georgia"); +pref("font.name.cursive.x-unicode", "Tinos, Georgia"); +pref("font.name.cursive.x-western", "Tinos, Georgia"); +pref("font.name.fantasy.ar", "Noto Naskh Arabic"); +pref("font.name.fantasy.el", "Tinos, Georgia"); pref("font.name.fantasy.he", "Noto Sans Hebrew"); -pref("font.name.fantasy.x-cyrillic", "Noto Serif"); -pref("font.name.fantasy.x-unicode", "Noto Serif"); -pref("font.name.fantasy.x-western", "Noto Serif"); -pref("font.name.monospace.ar", "Noto Kufi Arabic"); -pref("font.name.monospace.el", "Cousine"); +pref("font.name.fantasy.x-cyrillic", "Tinos, Georgia"); +pref("font.name.fantasy.x-unicode", "Tinos, Georgia"); +pref("font.name.fantasy.x-western", "Tinos, Georgia"); +pref("font.name.monospace.ar", "Noto Naskh Arabic"); +pref("font.name.monospace.el", "Tinos, Georgia"); pref("font.name.monospace.he", "Noto Sans Hebrew"); pref("font.name.monospace.ja", "Noto Sans CJK SC Regular"); pref("font.name.monospace.ko", "Noto Sans CJK SC Regular"); @@ -360,7 +371,7 @@ pref("font.name.monospace.my", "Noto Sans Myanmar"); pref("font.name.monospace.th", "Noto Sans Thai"); pref("font.name.monospace.x-armn", "Noto Sans Armenian"); pref("font.name.monospace.x-beng", "Noto Sans Bengali"); -pref("font.name.monospace.x-cyrillic", "Cousine"); +pref("font.name.monospace.x-cyrillic", "Cousine, Courier, Courier New"); pref("font.name.monospace.x-devanagari", "Noto Sans Devanagari"); pref("font.name.monospace.x-ethi", "Noto Sans Ethiopic"); pref("font.name.monospace.x-geor", "Noto Sans Georgian"); @@ -374,20 +385,20 @@ pref("font.name.monospace.x-sinh", "Noto Sans Sinhala"); pref("font.name.monospace.x-tamil", "Noto Sans Tamil"); pref("font.name.monospace.x-telu", "Noto Sans Telugu"); pref("font.name.monospace.x-tibt", "Noto Sans Tibetan"); -pref("font.name.monospace.x-unicode", "Cousine"); -pref("font.name.monospace.x-western", "Cousine"); +pref("font.name.monospace.x-unicode", "Cousine, Courier, Courier New"); +pref("font.name.monospace.x-western", "Cousine, Courier, Courier New"); pref("font.name.monospace.zh-CN", "Noto Sans CJK SC Regular"); pref("font.name.monospace.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.monospace.zh-TW", "Noto Sans CJK SC Regular"); pref("font.name.sans-serif.ar", "Noto Naskh Arabic"); -pref("font.name.sans-serif.el", "Noto Sans"); +pref("font.name.sans-serif.el", "Arimo, Arial, Verdana"); pref("font.name.sans-serif.he", "Noto Sans Hebrew"); pref("font.name.sans-serif.ja", "Noto Sans CJK SC Regular"); pref("font.name.sans-serif.ko", "Noto Sans CJK SC Regular"); pref("font.name.sans-serif.th", "Noto Sans Thai"); pref("font.name.sans-serif.x-armn", "Noto Sans Armenian"); pref("font.name.sans-serif.x-beng", "Noto Sans Bengali"); -pref("font.name.sans-serif.x-cyrillic", "Noto Sans"); +pref("font.name.sans-serif.x-cyrillic", "Arimo, Arial, Verdana"); pref("font.name.sans-serif.x-devanagari", "Noto Sans Devanagari"); pref("font.name.sans-serif.x-ethi", "Noto Sans Ethiopic"); pref("font.name.sans-serif.x-geor", "Noto Sans Georgian"); @@ -401,14 +412,14 @@ pref("font.name.sans-serif.x-sinh", "Noto Sans Sinhala"); pref("font.name.sans-serif.x-tamil", "Noto Sans Tamil"); pref("font.name.sans-serif.x-telu", "Noto Sans Telugu"); pref("font.name.sans-serif.x-tibt", "Noto Sans Tibetan"); -pref("font.name.sans-serif.x-unicode", "Noto Sans"); -pref("font.name.sans-serif.x-western", "Noto Sans"); +pref("font.name.sans-serif.x-unicode", "Arimo, Arial, Verdana"); +pref("font.name.sans-serif.x-western", "Arimo, Arial, Verdana"); pref("font.name.sans-serif.zh-CN", "Noto Sans CJK SC Regular"); pref("font.name.sans-serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.sans-serif.zh-TW", "Noto Sans CJK SC Regular"); pref("font.name.sans.my", "Noto Sans Myanmar"); pref("font.name.serif.ar", "Noto Naskh Arabic"); -pref("font.name.serif.el", "Noto Serif"); +pref("font.name.serif.el", "Tinos, Georgia"); pref("font.name.serif.he", "Noto Sans Hebrew"); pref("font.name.serif.ja", "Noto Sans CJK SC Regular"); pref("font.name.serif.ko", "Noto Sans CJK SC Regular"); @@ -416,7 +427,7 @@ pref("font.name.serif.my", "Noto Sans Myanmar"); pref("font.name.serif.th", "Noto Serif Thai"); pref("font.name.serif.x-armn", "Noto Serif Armenian"); pref("font.name.serif.x-beng", "Noto Sans Bengali"); -pref("font.name.serif.x-cyrillic", "Noto Serif"); +pref("font.name.serif.x-cyrillic", "Tinos, Georgia"); pref("font.name.serif.x-devanagari", "Noto Sans Devanagari"); pref("font.name.serif.x-ethi", "Noto Sans Ethiopic"); pref("font.name.serif.x-geor", "Noto Sans Georgian"); @@ -430,10 +441,10 @@ pref("font.name.serif.x-sinh", "Noto Sans Sinhala"); pref("font.name.serif.x-tamil", "Noto Sans Tamil"); pref("font.name.serif.x-telu", "Noto Sans Telugu"); pref("font.name.serif.x-tibt", "Noto Sans Tibetan"); -pref("font.name.serif.x-unicode", "Noto Serif"); -pref("font.name.serif.x-western", "Noto Serif"); +pref("font.name.serif.x-unicode", "Tinos, Georgia"); +pref("font.name.serif.x-western", "Tinos, Georgia"); pref("font.name.serif.zh-CN", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-HK", "Noto Sans CJK SC Regular"); pref("font.name.serif.zh-TW", "Noto Sans CJK SC Regular"); -pref("font.system.whitelist", "Cousine, Noto Kufi Arabic, Noto Naskh Arabic, Noto Sans, Noto Sans Armenian, Noto Sans Bengali, Noto Sans Buginese, Noto Sans CJK SC Regular, Noto Sans Canadian Aboriginal, Noto Sans Cherokee, Noto Sans Devanagari, Noto Sans Ethiopic, Noto Sans Georgian, Noto Sans Gujarati, Noto Sans Gurmukhi, Noto Sans Hebrew, Noto Sans Kannada, Noto Sans Khmer, Noto Sans Lao, Noto Sans Malayalam, Noto Sans Mongolian, Noto Sans Myanmar, Noto Sans Oriya, Noto Sans Sinhala, Noto Sans Tamil, Noto Sans Telugu, Noto Sans Thaana, Noto Sans Thai, Noto Sans Tibetan, Noto Sans Yi, Noto Serif, Noto Serif Armenian, Noto Serif Khmer, Noto Serif Lao, Noto Serif Thai"); + #endif

1 0

[tor-browser-bundle/master] Bump stable versions
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit 8bc8d7bca0eaa3f6eac4133d7984e49caa1c9796 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 10:18:39 2015 +0000 Bump stable versions --- gitian/versions | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gitian/versions b/gitian/versions index cea6029..ebed0e0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,15 +4,15 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.7.0esr +FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 -TOR_TAG=tor-0.2.6.9 -TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.6 -HTTPSE_TAG=5.0.5 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 +TOR_TAG=tor-0.2.6.10 +TORLAUNCHER_TAG=0.2.7.7 +TORBUTTON_TAG=1.9.3.2 +HTTPSE_TAG=5.0.7 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.18 +MEEK_TAG=0.20 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -36,7 +36,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1o +OPENSSL_VER=1.0.1p GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -83,13 +83,13 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz NOTOCJKFONT_PACKAGE=NotoSansCJKsc-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 +OPENSSL_HASH=bd5ee6803165c0fb60bbecbacacf244f1f90d2aa0d71353af610c29121e9b2f1 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e +NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Update changelog; version bump for alpha
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit c490ddd39f0ed564caab3819a1e033bb91ff60f2 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 10:09:17 2015 +0000 Update changelog; version bump for alpha --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1270095..10fc5a1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -15,6 +15,7 @@ Tor Browser 5.5a1 -- August 11 2015 * Bug 16715: Use ThreadsafeIsCallerChrome() instead of IsCallerChrome() * Bug 16572: Verify cache isolation for XMLHttpRequests in Web Workers * Bug 16311: Fix navigation timing in ESR 38 + * Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent (fixup) Tor Browser 5.0 -- August 11 2015 * All Platforms diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d4dece0..840e8b9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.1.0esr +FIREFOX_VERSION=38.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.2-alpha -TORLAUNCHER_TAG=0.2.7.6 -TORBUTTON_TAG=1.9.3.1 +TORLAUNCHER_TAG=0.2.7.7 +TORBUTTON_TAG=1.9.3.3 HTTPSE_TAG=5.0.7 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -39,7 +39,7 @@ GITIAN_TAG=tor-browser-builder-3.x-8 OPENSSL_VER=1.0.1p GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5 @@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.31-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.34-sm+fn+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -89,7 +89,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=151339f3ba663a527b2bf7ce88a4ea1379833b7ac3b6277cdf67f6ab5a33af1b +NOSCRIPT_HASH=d17e3eeb8cc6ddc6c6cabd002184eced5c8cf061c9d337bac2085e7d2daceacd MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Update config.yml
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit b54ac370d3e647fa533bfc9af2d2fc539887bcaa Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 09:12:42 2015 +0000 Update config.yml --- tools/update-responses/config.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 5a4d965..4d2e7cb 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,26 +9,26 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 5.0a4 - release: 4.5.2 + alpha: 5.5a1 + release: 5.0 versions: - 4.5.2: - platformVersion: 31.7.0 + 5.0: + platformVersion: 38.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5.2 + download_url: https://www.torproject.org/dist/torbrowser/5.0 incremental_from: - - 4.5.1 + - 4.5.3 migrate_archs: osx32: osx64 osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.0a4: - platformVersion: 38.1.0 + 5.5a1: + platformVersion: 38.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0a4 + download_url: https://www.torproject.org/dist/torbrowser/5.5a1 incremental_from: - - 5.0a3 + - 5.0a4 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit 9467a9d330a20b6850f7393185aec5d08e903df1 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 7 18:18:04 2015 -0700 fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent --- dom/events/KeyCodeConsensus.h | 37 +++++++++++++++++++------------------ dom/events/KeyboardEvent.cpp | 5 +++-- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dom/events/KeyCodeConsensus.h b/dom/events/KeyCodeConsensus.h index 53ec7f6..47d8341 100644 --- a/dom/events/KeyCodeConsensus.h +++ b/dom/events/KeyCodeConsensus.h @@ -9,9 +9,9 @@ // KEY_INTERNAL is called by KEY or SHIFT. #define KEY_INTERNAL(key, code, keyCode, shift) \ - gCodes->Put(NS_LITERAL_STRING(key), NS_LITERAL_STRING(#code)); \ - gKeyCodes->Put(NS_LITERAL_STRING(key), keyCode); \ - gShiftStates->Put(NS_LITERAL_STRING(key), shift); + gCodes->Put(NS_LITERAL_STRING(key), NS_LITERAL_STRING(#code)); \ + gKeyCodes->Put(NS_LITERAL_STRING(key), keyCode); \ + gShiftStates->Put(NS_LITERAL_STRING(key), shift); // KEY and SHIFT assign a consensus codeName and keyCode for the given keyName. // KEY indicates that shift is off. @@ -29,7 +29,7 @@ static nsDataHashtable<nsStringHashKey, bool>* gShiftStates; static StaticMutex createKeyCodesMutex; -// Populate the global static maps gCodes, gKeCodes, gShiftStates +// Populate the global static maps gCodes, gKeyCodes, gShiftStates // with their constant values. static void createKeyCodes() { @@ -41,32 +41,33 @@ static void createKeyCodes() gKeyCodes = new nsDataHashtable<nsStringHashKey, uint32_t>(); gShiftStates = new nsDataHashtable<nsStringHashKey, bool>(); - KEY("AltLeft", AltLeft, 18) - KEY("AltRight", AltRight, 18) + KEY("Alt", AltLeft, 18) + KEY("ArrowDown", ArrowDown, 40) + KEY("ArrowLeft", ArrowLeft, 37) + KEY("ArrowRight", ArrowRight, 39) + KEY("ArrowUp", ArrowUp, 38) + KEY("Backspace", Backspace, 8) KEY("CapsLock", CapsLock, 20) - KEY("Control", ControlLeft, 17) - KEY("Meta", OSLeft, 91) - KEY("Shift", ShiftLeft, 16) KEY("ContextMenu", ContextMenu, 93) - KEY("Enter", Enter, 13) - KEY(" ", Space, 32) - KEY("Tab", Tab, 9) + KEY("Control", ControlLeft, 17) KEY("Delete", Delete, 46) KEY("End", End, 35) + KEY("Enter", Enter, 13) + KEY("Escape", Escape, 27) KEY("Help", Help, 6) KEY("Home", Home, 36) KEY("Insert", Insert, 45) + KEY("Meta", OSLeft, 91) KEY("PageDown", PageDown, 34) KEY("PageUp", PageUp, 33) - KEY("ArrowDown", ArrowDown, 40) - KEY("ArrowLeft", ArrowLeft, 37) - KEY("ArrowRight", ArrowRight, 39) - KEY("ArrowUp", ArrowUp, 38) - KEY("Escape", Escape, 27) + KEY("Pause", Pause, 19) KEY("PrintScreen", PrintScreen, 44) KEY("ScrollLock", ScrollLock, 145) - KEY("Pause", Pause, 19) + KEY("Shift", ShiftLeft, 16) + KEY("Tab", Tab, 9) + // Leaving "Clear" key unimplemented; it's inconsistent between platforms. + KEY(" ", Space, 32) KEY(",", Comma, 188) SHIFT("<", Comma, 188) KEY(".", Period, 190) diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp index 6a68f96..19d4e73 100644 --- a/dom/events/KeyboardEvent.cpp +++ b/dom/events/KeyboardEvent.cpp @@ -50,8 +50,9 @@ KeyboardEvent::AltKey() if (ResistFingerprinting()) { nsString keyName; GetKey(keyName); - bool exists = gCodes->Get(keyName, nullptr); - return exists ? false : altState; + bool fakeShiftState; + gShiftStates->Get(keyName, &fakeShiftState); + return fakeShiftState ? false : altState; } else { return altState; }

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'arthur/15646+4' into tor-browser-38.1.0esr-5.0-1
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit f1f66dc5096188a60a96df7ee5e32d9a4b81dbe5 Merge: d3c069a 9467a9d Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 09:23:16 2015 +0000 Merge remote-tracking branch 'arthur/15646+4' into tor-browser-38.1.0esr-5.0-1 dom/events/KeyCodeConsensus.h | 37 +++++++++++++++++++------------------ dom/events/KeyboardEvent.cpp | 5 +++-- 2 files changed, 22 insertions(+), 20 deletions(-)

1 0

[torbutton/master] Revert "Revert "Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning.""""
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit a0a651607a957ac8473cea717c8a440cdcea0144 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 09:07:24 2015 +0000 Revert "Revert "Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning."""" This reverts commit 495c007916ef9a678113c0b1404a7519d6881f0c. --- src/defaults/preferences/preferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 83706ef..ce66d0e 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -113,7 +113,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 3); +pref("extensions.torbutton.maximize_warnings_remaining", 0); pref("extensions.torbutton.startup_resize_period", true); // Security prefs: @@ -154,7 +154,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",false); +pref("extensions.torbutton.resize_windows",true); pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false);

1 0

[torbutton/master] version bump
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit a98a5118ae0c7726b684d7ad7fed2f6e56f93ef8 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 09:08:03 2015 +0000 version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 56eefbe..160baa4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.3.2</em:version> + <em:version>1.9.3.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Add bug 16311 to changelog
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit 45a04175191deda9cbf049772d9c27dbef7874f5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Aug 8 08:53:25 2015 +0000 Add bug 16311 to changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c6c4d71..1270095 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -14,6 +14,7 @@ Tor Browser 5.5a1 -- August 11 2015 * Bug 16730: Prevent NoScript from updating the default whitelist * Bug 16715: Use ThreadsafeIsCallerChrome() instead of IsCallerChrome() * Bug 16572: Verify cache isolation for XMLHttpRequests in Web Workers + * Bug 16311: Fix navigation timing in ESR 38 Tor Browser 5.0 -- August 11 2015 * All Platforms @@ -77,6 +78,7 @@ Tor Browser 5.0 -- August 11 2015 * Bug 14952: Disable HTTP/2 * Bug 1517: Reduce precision of time for Javascript * Bug 13670: Ensure OCSP & favicons respect URL bar domain isolation + * Bug 16311: Fix navigation timing in ESR 38 * Windows * Bug 16014: Staged update fails if meek is enabled * Bug 16269: repeated add-on compatibility check after update (meek enabled)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Bug #16311: Fix the responseEnd attribute (navigation timing)
by gk＠torproject.org 08 Aug '15

08 Aug '15

commit d3c069a3cc6bc073e7230d1ef3a8d1f09346364e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Aug 8 01:48:33 2015 +0200 Bug #16311: Fix the responseEnd attribute (navigation timing) This reverts a change introduced by this patch: https://hg.mozilla.org/mozilla-central/rev/9b0c94f564f3#l11.43 --- dom/base/nsPerformance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/base/nsPerformance.cpp b/dom/base/nsPerformance.cpp index 6dfcc25..67a374d 100644 --- a/dom/base/nsPerformance.cpp +++ b/dom/base/nsPerformance.cpp @@ -341,7 +341,7 @@ nsPerformanceTiming::ResponseStart() DOMHighResTimeStamp nsPerformanceTiming::ResponseEndHighRes() { - if (!IsInitialized()) { + if (!nsContentUtils::IsPerformanceTimingEnabled() || !IsInitialized()) { return mZeroTime; } if (mResponseEnd.IsNull() ||

1 0

[tor-browser-bundle/master] Clean up 5.0 changelog a bit.
by mikeperry＠torproject.org 08 Aug '15

08 Aug '15

commit 43b3571cd26f730a7595979589d5686c010134a1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Aug 7 23:30:21 2015 -0700 Clean up 5.0 changelog a bit. It should only have the delta from 4.5.3, but it should list the full set of tor patch backports. --- Bundle-Data/Docs/ChangeLog.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f5b0198..c6c4d71 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,8 +22,10 @@ Tor Browser 5.0 -- August 11 2015 * Update HTTPS-Everywhere to 5.0.7 * Update NoScript to 2.6.9.34 * Update meek to 0.20 - * Tor patch backport + * Update Tor to 0.2.6.10 with patches: * Bug 16674: Allow FQDNs ending with a single '.' in our SOCKS host name checks. + * Bug 16430: Allow DNS names with _ characters in them (fixes nytimes.com) + * Bug 15482: Don't allow circuits to change while a site is in use * Update Torbutton to 1.9.3.2 * Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click * Bug 16730: Reset NoScript whitelist on upgrade @@ -54,7 +56,6 @@ Tor Browser 5.0 -- August 11 2015 * Bug 16528: Prevent indexedDB Modernizr site breakage on Twitter and elsewhere * Bug 16523: Fix in-browser JavaScript debugger * Bug 16236: Windows updater: avoid writing to the registry - * Bug 16005: Restrict WebGL minimal mode a bit (fixup) * Bug 16625: Fully disable network connection prediction * Bug 16495: Fix SVG crash when security level is set to "High" * Bug 13247: Fix meek profile error after bowser restarts @@ -63,7 +64,7 @@ Tor Browser 5.0 -- August 11 2015 * Bug 16439: Remove Roku screencasting code * Bug 16285: Disabling EME bits * Bug 16206: Enforce certificate pinning - * Bug 15910: Disable GMPs for now + * Bug 15910: Disable Gecko Media Plugins for now * Bug 13670: Isolate OCSP requests by first party domain * Bug 16448: Isolate favicon requests by first party * Bug 7561: Disable FTP request caching @@ -76,7 +77,6 @@ Tor Browser 5.0 -- August 11 2015 * Bug 14952: Disable HTTP/2 * Bug 1517: Reduce precision of time for Javascript * Bug 13670: Ensure OCSP & favicons respect URL bar domain isolation - * Bug 13875: Improve the spoofing of window.devicePixelRatio * Windows * Bug 16014: Staged update fails if meek is enabled * Bug 16269: repeated add-on compatibility check after update (meek enabled)

1 0

[tor-browser-bundle/master] Changelog update and fixup
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit 15abca4ad73aab6db7213c105888ecd079b3f8fe Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 21:17:25 2015 +0000 Changelog update and fixup --- Bundle-Data/Docs/ChangeLog.txt | 94 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fd6d158..f5b0198 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,95 @@ +Tor Browser 5.5a1 -- August 11 2015 + * All Platforms + * Update Firefox to 38.2.0esr + * Update NoScript to 2.6.9.34 + * Update Torbutton to 1.9.3.3 + * Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click + * Bug 16730: Reset NoScript whitelist on upgrade + * Bug 16722: Prevent "Tiles" feature from being enabled after upgrade + * Bug 16488: Remove "Sign in to Sync" from the browser menu (fixup) + * Bug 14429: Make sure the automatic resizing is enabled + * Translation updates + * Update Tor Launcher to 0.2.7.7 + * Translation updates + * Bug 16730: Prevent NoScript from updating the default whitelist + * Bug 16715: Use ThreadsafeIsCallerChrome() instead of IsCallerChrome() + * Bug 16572: Verify cache isolation for XMLHttpRequests in Web Workers + +Tor Browser 5.0 -- August 11 2015 + * All Platforms + * Update Firefox to 38.2.0esr + * Update OpenSSL to 1.0.1p + * Update HTTPS-Everywhere to 5.0.7 + * Update NoScript to 2.6.9.34 + * Update meek to 0.20 + * Tor patch backport + * Bug 16674: Allow FQDNs ending with a single '.' in our SOCKS host name checks. + * Update Torbutton to 1.9.3.2 + * Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click + * Bug 16730: Reset NoScript whitelist on upgrade + * Bug 16722: Prevent "Tiles" feature from being enabled after upgrade + * Bug 16488: Remove "Sign in to Sync" from the browser menu (fixup) + * Bug 16268: Show Tor Browser logo on About page + * Bug 16639: Check for Updates menu item can cause update download failure + * Bug 15781: Remove the sessionstore filter + * Bug 15656: Sync privacy.resistFingerprinting with Torbutton pref + * Bug 16427: Use internal update URL to block updates (instead of 127.0.0.1) + * Bug 16200: Update Cache API usage and prefs for FF38 + * Bug 16357: Use Mozilla API to wipe permissions db + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + * Update Tor Launcher to 0.2.7.7 + * Bug 16428: Use internal update URL to block updates (instead of 127.0.0.1) + * Bug 15145: Visually distinguish "proxy" and "bridge" screens. + * Translation updates + * Bug 16730: Prevent NoScript from updating the default whitelist + * Bug 16715: Use ThreadsafeIsCallerChrome() instead of IsCallerChrome() + * Bug 16572: Verify cache isolation for XMLHttpRequests in Web Workers + * Bug 16884: Prefer IPv6 when supported by the current Tor exit + * Bug 16488: Remove "Sign in to Sync" from the browser menu + * Bug 16662: Enable network.http.spdy.* prefs in meek-http-helper + * Bug 15703: Isolate mediasource URIs and media streams to first party + * Bug 16429+16416: Isolate blob URIs to first party + * Bug 16632: Turn on the background updater and restart prompting + * Bug 16528: Prevent indexedDB Modernizr site breakage on Twitter and elsewhere + * Bug 16523: Fix in-browser JavaScript debugger + * Bug 16236: Windows updater: avoid writing to the registry + * Bug 16005: Restrict WebGL minimal mode a bit (fixup) + * Bug 16625: Fully disable network connection prediction + * Bug 16495: Fix SVG crash when security level is set to "High" + * Bug 13247: Fix meek profile error after bowser restarts + * Bug 16005: Relax WebGL minimal mode + * Bug 16300: Isolate Broadcast Channels to first party + * Bug 16439: Remove Roku screencasting code + * Bug 16285: Disabling EME bits + * Bug 16206: Enforce certificate pinning + * Bug 15910: Disable GMPs for now + * Bug 13670: Isolate OCSP requests by first party domain + * Bug 16448: Isolate favicon requests by first party + * Bug 7561: Disable FTP request caching + * Bug 6503: Fix single-word URL bar searching + * Bug 15526: ES6 page crashes Tor Browser + * Bug 16254: Disable GeoIP-based search results. + * Bug 16222: Disable WebIDE to prevent remote debugging and addon downloads. + * Bug 13024: Disable DOM Resource Timing API + * Bug 16340: Disable User Timing API + * Bug 14952: Disable HTTP/2 + * Bug 1517: Reduce precision of time for Javascript + * Bug 13670: Ensure OCSP & favicons respect URL bar domain isolation + * Bug 13875: Improve the spoofing of window.devicePixelRatio + * Windows + * Bug 16014: Staged update fails if meek is enabled + * Bug 16269: repeated add-on compatibility check after update (meek enabled) + * Mac OS + * Use OSX 10.7 SDK + * Bug 16253: Tor Browser menu on OS X is broken with ESR 38 + * Bug 15773: Enable ICU on OS X + * Build System + * Bug 16351: Upgrade our toolchain to use GCC 5.1 + * Bug 15772 and child tickets: Update build system for Firefox 38 + * Bugs 15921+15922: Fix build errors during Mozilla Tryserver builds + * Bug 15864: rename sha256sums.txt to sha256sums-unsigned-build.txt + Tor Browser 5.0a4 -- August 3 2015 * All Platforms * Update Tor to 0.2.7.2-alpha with patches: @@ -43,7 +135,7 @@ Tor Browser 5.0a3 -- June 30 2015 * Bug 16200: Update Cache API usage and prefs for FF38 * Bug 16357: Use Mozilla API to wipe permissions db * Translation updates - * Update Tor Launcher to 0.2.6.7 + * Update Tor Launcher to 0.2.7.6 * Bug 16428: Use internal update URL to block updates (instead of 127.0.0.1) * Bug 15145: Visually distinguish "proxy" and "bridge" screens. * Translation updates

1 0

[torbutton/master] Revert "Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning."""
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit 495c007916ef9a678113c0b1404a7519d6881f0c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 21:07:44 2015 +0000 Revert "Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning.""" This reverts commit edeaca158e86d1be1bea5bbb92cc6a3c9f481c23. --- src/defaults/preferences/preferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ce66d0e..83706ef 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -113,7 +113,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.startup_resize_period", true); // Security prefs: @@ -154,7 +154,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",true); +pref("extensions.torbutton.resize_windows",false); pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false);

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit b60ed9ad14c39b0e7b446f87e763107b86642061 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 21:06:15 2015 +0000 Translation updates --- src/chrome/locale/eu/aboutTor.properties | 6 +- src/chrome/locale/eu/brand.dtd | 8 +- src/chrome/locale/eu/torbutton.properties | 12 +- src/chrome/locale/tr/aboutDialog.dtd | 14 +- src/chrome/locale/tr/aboutTor.dtd | 38 ++--- src/chrome/locale/tr/aboutTor.properties | 8 +- src/chrome/locale/tr/brand.dtd | 16 +- src/chrome/locale/tr/brand.properties | 12 +- src/chrome/locale/tr/torbutton.dtd | 264 ++++++++++++++--------------- src/chrome/locale/tr/torbutton.properties | 110 ++++++------ 10 files changed, 244 insertions(+), 244 deletions(-) diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties index d607324..30a7858 100644 --- a/src/chrome/locale/eu/aboutTor.properties +++ b/src/chrome/locale/eu/aboutTor.properties @@ -2,19 +2,19 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">Hasierako orria</a>. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">DuckDuckGo</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: <a href="%2$S">Disconnect.me</a>. # The following string is a link which replaces %1$S above. aboutTor.searchDC.privacy.link=https://disconnect.me/privacy # The following string is a link which replaces %2$S above. diff --git a/src/chrome/locale/eu/brand.dtd b/src/chrome/locale/eu/brand.dtd index 0d9a84b..a65cca4 100644 --- a/src/chrome/locale/eu/brand.dtd +++ b/src/chrome/locale/eu/brand.dtd @@ -9,7 +9,7 @@ <!ENTITY trademarkInfo.part1 "Firefox eta Firefox logoak Mozilla Fundazioaren marka errgistratuak dira.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "Klikatu sisteman instalatuta daunden pluginak kargatzeko"> +<!ENTITY plugins.installed.enable "Pluginak gaitu."> +<!ENTITY plugins.installed.disable "Pluginak ezgaitu"> +<!ENTITY plugins.installed.disable.tip "Klikatu sistemaren pluginak karga ez daitezen"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index fd00c4d..d4a905f 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -1,12 +1,12 @@ torbutton.button.tooltip.disabled = Tor gaitu torbutton.button.tooltip.enabled = Tor ezgaitu torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site -torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.ip_unknown = IP ezezaguna +torbutton.circuit_display.onion_site = Onion webgunea +torbutton.circuit_display.this_browser = Nagibatzaile hau torbutton.circuit_display.relay = relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.tor_bridge = Zubia +torbutton.circuit_display.unknown_country = Herrialde ezezaguna torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko @@ -72,7 +72,7 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem +profileProblemTitle=%S Profilarekin Arazoa profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. diff --git a/src/chrome/locale/tr/aboutDialog.dtd b/src/chrome/locale/tr/aboutDialog.dtd index 794c6e7..4958996 100644 --- a/src/chrome/locale/tr/aboutDialog.dtd +++ b/src/chrome/locale/tr/aboutDialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName;, ">  -<!ENTITY project.tpoLink "kar amacı gütmeyen, çevrimiçi gizlilik ve özgürlüğünüzü koruyan"> +<!ENTITY project.tpoLink "kar amacı gütmeyen, çevrim içi gizlilik ve özgürlüğünüzü koruyan"> <!ENTITY project.end "&vendorShortName; tarafından geliştirilmiştir."> <!ENTITY help.start "Yardım ister misiniz?">  -<!ENTITY help.donateLink "Bağış Yapın"> +<!ENTITY help.donateLink "Bağış yapın"> <!ENTITY help.or "ya da">  -<!ENTITY help.getInvolvedLink "katılın"> +<!ENTITY help.getInvolvedLink "çalışmalara katılın"> <!ENTITY help.end "!">  -<!ENTITY bottomLinks.questions "Sorunuz var mı?"> +<!ENTITY bottomLinks.questions "Sorularınız mı var?">  -<!ENTITY bottomLinks.grow "Tor Ağı'nın büyümesine yardım edin."> +<!ENTITY bottomLinks.grow "Tor Ağı'nın Büyümesine Katkıda Bulunun!">  -<!ENTITY bottomLinks.license "Lisans bilgisi"> -<!ENTITY tor.TrademarkStatement "'Tor' ve 'Soğan Logosu' Tor Projesi Inc.'in tescilli markalarıdır."> +<!ENTITY bottomLinks.license "Lisans Bilgileri"> +<!ENTITY tor.TrademarkStatement "'Tor' ve 'Soğan Logosu' Tor Project Inc. tarafından tescil edilmiş markalardır."> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 1533cea..2b7f14a 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -6,44 +6,44 @@ <!ENTITY aboutTor.title "Tor Hakkında"> -<!ENTITY aboutTor.outOfDateTorOn.label "AMA, bu tarayıcı güncel değil."> +<!ENTITY aboutTor.outOfDateTorOn.label "BUNUNLA BİRLİKTE, bu tarayıcı güncel değil."> <!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel değil."> -<!ENTITY aboutTor.outOfDate2.label "Soğan simgesine tıklayın ve ardından Tor Tarayıcı Güncellemesini Denetle'yi seçin."> +<!ENTITY aboutTor.outOfDate2.label "Soğan simgesine tıklayın ve ardından Tor Browser Güncellemesini denetleyin."> -<!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Test Edin"> +<!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Sınayın"> <!ENTITY aboutTor.success.label "Tebrikler!"> -<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için yapılandırılmıştır."> -<!ENTITY aboutTor.success3.label "Artık İnternet'i anonim olarak kullanmakta özgürsünüz!"> -<!ENTITY aboutTor.failure.label "Bir Şeyler Yanlış Gitti!"> -<!ENTITY aboutTor.failure2.label "Bu tarayıcıda Tor çalışmıyor."> -<!ENTITY aboutTor.failure3prefix.label "Yardım için %S ile bağlantıya geçin."> +<!ENTITY aboutTor.success2.label "Bu tarayıcı Tor kullanımı için ayarlandı."> +<!ENTITY aboutTor.success3.label "Artık İnternet üzerinde anonim olarak işlem yapabilirsiniz."> +<!ENTITY aboutTor.failure.label "Bir Şeyler Ters Gitti!"> +<!ENTITY aboutTor.failure2.label "Tor bu tarayıcıda çalışmıyor."> +<!ENTITY aboutTor.failure3prefix.label "Yardım almak için şu adresi kullanarak %S ile görüşün"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Ara"> +<!ENTITY aboutTor.search.label "Arama"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> -<!ENTITY aboutTor.torInfo1.label "Ek bilgi:"> +<!ENTITY aboutTor.torInfo1.label "Ek Bilgiler:"> <!ENTITY aboutTor.torInfo2.label "Ülke ve IP Adresi:"> -<!ENTITY aboutTor.torInfo3.label "Çıkış Düğümü:"> -<!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler ile ilgili herhangi bir bilgi toplamaz."> -<!ENTITY aboutTor.whatnextQuestion.label "Sıradaki Ne?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için tüm ihtiyacınız olan şey değildir! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> -<!ENTITY aboutTor.whatnext.label "Anonim kalmak için püf noktalar »"> +<!ENTITY aboutTor.torInfo3.label "Çıkış Noktası:"> +<!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler hakkında herhangi bir bilgi toplamaz."> +<!ENTITY aboutTor.whatnextQuestion.label "Şimdi ne olacak?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacağınız her şeyi sağlamaz! Kimliğinizin güvende kalması için bazı İnternet alışkanlıklarınızı değiştirmeniz gerekebilir."> +<!ENTITY aboutTor.whatnext.label "Anonim Kalma İp Uçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> -<!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı ve daha güçlü yapmamız konusunda yardım edebilmeniz için bir çok yol var:"> -<!ENTITY aboutTor.helpInfo3.label "Bir Tor Ayna Düğümü Çalıştır »"> +<!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> +<!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Çalıştır »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Servislerinizi Gönüllü Yapın »"> +<!ENTITY aboutTor.helpInfo4.label "Gönüllü Hizmetlerde Bulunun »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.helpInfo5.label "Bağış Yapın »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "Tor Projesi çevrimiçi gizlilik ve mahremiyet araştırma, geliştirme ve eğitime adanmış bir ABD 501(c)(3) kar amacı gütmeyen bir kuruluştur."> +<!ENTITY aboutTor.footer.label "Tor Projesi, ABD 501(c)(3) kapsamında çevrim içi gizlilik ve mahremiyet üzerine araştırma, geliştirme ve eğitim çalışmaları yapan ve kar amacı gütmeyen bir kuruluştur."> <!ENTITY aboutTor.learnMore.label "Tor Projesi hakkında daha çok şey öğrenin »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index a9c53ab..18cf582 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -2,20 +2,20 @@ # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>. +aboutTor.searchSP.privacy=<a href="%2$S">Startpage</a> kullanarak <a href="%1$S">güvenli</a> arama yapın. # The following string is a link which replaces %1$S above. aboutTor.searchSP.privacy.link=https://startpage.com/tur/protect-privacy.ht… # The following string is a link which replaces %2$S above. aboutTor.searchSP.search.link=https://startpage.com/ -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. +aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a> kullanarak <a href="%1$S">güvenli</a> arama yapın. # The following string is a link which replaces %1$S above. aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.searchDC.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Disconnect.me</a>. +aboutTor.searchDC.privacy=<a href="%2$S">Disconnect.me</a> kullanarak <a href="%1$S">güvenli</a> arama yapın. # The following string is a link which replaces %1$S above. -aboutTor.searchDC.privacy.link=https://disconnect.me/privacy +aboutTor.searchDC.privacy.link= # The following string is a link which replaces %2$S above. aboutTor.searchDC.search.link=https://search.disconnect.me/ diff --git a/src/chrome/locale/tr/brand.dtd b/src/chrome/locale/tr/brand.dtd index 545e2cd..6d9d1ed 100644 --- a/src/chrome/locale/tr/brand.dtd +++ b/src/chrome/locale/tr/brand.dtd @@ -2,14 +2,14 @@ - 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/. --> -<!ENTITY brandShorterName "Tor Tarayıcı"> -<!ENTITY brandShortName "Tor Tarayıcı"> -<!ENTITY brandFullName "Tor Tarayıcı"> +<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShortName "Tor Browser"> +<!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Projesi"> -<!ENTITY trademarkInfo.part1 "Firefox ve Firefox logoları Mozilla Vakfı'nın ticari markalarıdır."> +<!ENTITY trademarkInfo.part1 "Firefox ve Firefox logoları Mozilla Vakfı tarafından tescil edilmiş ticari markalardır.">  -<!ENTITY plugins.installed.find "Yüklü sistem eklentilerini yüklemek için tıklayın"> -<!ENTITY plugins.installed.enable "Eklentileri etkinleştir"> -<!ENTITY plugins.installed.disable "Eklentileri devre dışı bırak"> -<!ENTITY plugins.installed.disable.tip "Sistem eklentilerinin yüklenmesini önlemek için tıklayın"> +<!ENTITY plugins.installed.find "Kurulmuş sistem uygulama eklerini yüklemek için tıklayın"> +<!ENTITY plugins.installed.enable "Uygulama eklerini etkinleştir"> +<!ENTITY plugins.installed.disable "Uygulama eklerini devre dışı bırak"> +<!ENTITY plugins.installed.disable.tip "Sistem uygulama eklerinin yüklenmesini önlemek için tıklayın"> diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties index 5f032dd..9635260 100644 --- a/src/chrome/locale/tr/brand.properties +++ b/src/chrome/locale/tr/brand.properties @@ -2,14 +2,14 @@ # 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/. -brandShortName=Tor Tarayıcı -brandFullName=Tor Tarayıcı +brandShortName=Tor Browser +brandFullName=Tor Browser vendorShortName=Tor Projesi -homePageSingleStartMain=Firefox Başlangıç, dahili arama barındıran hızlı bir başlangıç sayfası -homePageImport=%S konumundan başlangıç sayfanızı kopyalayın. +homePageSingleStartMain=Firefox Start, içinde arama bulunan hızlı açılış sayfası +homePageImport=%S üzerinden açılış sayfanızı alın. -homePageMigrationPageTitle=Başlangıç Sayfası Seçimi -homePageMigrationDescription=Lütfen kullanmak istediğiniz başlangıç sayfasını seçin: +homePageMigrationPageTitle=Açılış Sayfası Seçimi +homePageMigrationDescription=Lütfen kullanmak istediğiniz açılış sayfasını seçin: syncBrandShortName=Eşitleme diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index fc67df3..00e9a7a 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -1,187 +1,187 @@ -<!ENTITY torbutton.prefs.title "Ayarlar"> +<!ENTITY torbutton.prefs.title "Torbutton Ayarları"> <!ENTITY torbutton.prefs.tor_settings "Vekil Sunucu Ayarları"> <!ENTITY torbutton.prefs.recommended_settings "Firefox sürümüm için önerilen vekil sunucu ayarlarını kullan"> -<!ENTITY torbutton.prefs.use_privoxy "Privoxy kullan"> -<!ENTITY torbutton.prefs.use_polipo "Polipo'yu kullan"> -<!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarlarını kullan"> +<!ENTITY torbutton.prefs.use_privoxy "Privoxy Kullan"> +<!ENTITY torbutton.prefs.use_polipo "Polipo Kullan"> +<!ENTITY torbutton.prefs.custom_settings "Özel vekil sunucu ayarları kullanılsın"> <!ENTITY torbutton.prefs.proxy.host.http "HTTP Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.https "SSL Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.ftp "FTP Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.gopher "Gopher Vekil Sunucusu:"> <!ENTITY torbutton.prefs.proxy.host.socks "SOCKS Sunucusu:"> -<!ENTITY torbutton.prefs.proxy.port "Bağl. Nok.:"> +<!ENTITY torbutton.prefs.proxy.port "Kapı:"> <!ENTITY torbutton.about.title "Torbutton Hakkında"> <!ENTITY torbutton.about.version "Sürüm:"> <!ENTITY torbutton.about.summary "Tor tarama gizliliğinizi korur."> -<!ENTITY torbutton.about.code "Kodlarda yardımı bulunanlar:"> -<!ENTITY torbutton.about.maintainer "Bakımcı:"> -<!ENTITY torbutton.about.security_review "Güvenlik özeti:"> -<!ENTITY torbutton.about.donate "Tor kullanmayı seviyorsanız ayrıca şunu da düşünebilirsiniz: "> -<!ENTITY torbutton.about.make_donation "Bağış yapmak"> -<!ENTITY torbutton.pref_connection.notice "Ayarları uygulamak için Torbuttonu devre dışı bırak."> -<!ENTITY torbutton.pref_connection.more_info "Daha fazla bilgi"> +<!ENTITY torbutton.about.code "Geliştirmeye Katkıda Bulunanlar:"> +<!ENTITY torbutton.about.maintainer "Yönetici:"> +<!ENTITY torbutton.about.security_review "Güvenlik Özeti:"> +<!ENTITY torbutton.about.donate "Tor yazılımını beğendiyseniz"> +<!ENTITY torbutton.about.make_donation "bağış yapmayı düşünün."> +<!ENTITY torbutton.pref_connection.notice "Bu ayarları uygulamak için Torbutton devre dışı bırakılsın."> +<!ENTITY torbutton.pref_connection.more_info "Ayrıntılı bilgiler"> <!ENTITY torbutton.pref_connection_more_info.title "Yardım"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton şu anda devre dışı. Vekil sunucu ayarlarını değiştirmek istiyorsanız, Torbutton'ı tekrar devre dışı bırakın. Genel ayarları değiştirecekseniz, ayarlar penceresini kullanın."> +<!ENTITY torbutton.pref_connection_more_info.text "Torbutton şu anda etkin. Tor-Dışı vekil sunucu ayarlarını değiştirmek istiyorsanız, Torbutton uygulamasını devre dışı bırakıp buraya geri gelin. Tor ayarlarınızı değiştirmek istiyorsanız Torbutton ayarları penceresini kullanın."> <!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik"> -<!ENTITY torbutton.context_menu.new_identity_key "S"> -<!ENTITY torbutton.context_menu.new_circuit "Bu site için yeni Tor devresi"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> +<!ENTITY torbutton.context_menu.new_circuit "Bu site için Tor devresini yenile"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "Durum"> +<!ENTITY torbutton.context_menu.toggle "Tor durumunu değiştir"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Gizlilik ve Güvenlik Ayarları..."> -<!ENTITY torbutton.context_menu.preferences.key "A"> +<!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Hakkında"> -<!ENTITY torbutton.context_menu.about.key "H"> +<!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Tor Ağ Ayarları..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Tor Tarayıcı Güncellemesini Denetle..."> -<!ENTITY torbutton.context_menu.downloadUpdate.key "H"> -<!ENTITY torbutton.context_menu.cookieProtections "Çerez Korumaları..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser Güncelleme Denetimi..."> +<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> +<!ENTITY torbutton.context_menu.cookieProtections "Çerez Koruması..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Tor URL'sini kopyala"> +<!ENTITY torbutton.context_menu.copyTor "Tor İnternet Adresini Kopyala"> <!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Tor URL'sini yeni sekmede aç"> -<!ENTITY torbutton.context_menu.openTorTab.key "p"> -<!ENTITY torbutton.context_menu.openTorWindow "Tor URL'sini Yeni Pencerede Aç"> +<!ENTITY torbutton.context_menu.openTorTab "Tor İnternet adresini yeni sekmede aç"> +<!ENTITY torbutton.context_menu.openTorTab.key "r"> +<!ENTITY torbutton.context_menu.openTorWindow "Tor İnternet adresini yeni pencerede aç"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Başlat"> +<!ENTITY torbutton.button.tooltip "Torbutton uygulamasını başlatmak için tıklayın"> <!ENTITY torbutton.prefs.privacy_security_settings "Gizlilik ve Güvenlik Ayarları"> -<!ENTITY torbutton.prefs.block_thread "Tor çalışırken geçmişi okumayı durdur(kritik)"> -<!ENTITY torbutton.prefs.block_thwrite "Tor çalışırken geçmişi oluşturmayı durdur(önerilen)"> -<!ENTITY torbutton.prefs.block_nthread "Tor çalışmıyorken geçmişi okumayı durdur (opsiyonel)"> -<!ENTITY torbutton.prefs.block_nthwrite "Tor çalışırken geçmişi oluştururken durdur(önerilen)"> -<!ENTITY torbutton.prefs.clear_history "Tor başlatılırken geçmişi temizle(önerilen)"> -<!ENTITY torbutton.prefs.clear_cache "Tor devredeyken tüm önbelleklemeleri temizle"> -<!ENTITY torbutton.prefs.block_cache "Disk ve önbellek erişimini engelle"> -<!ENTITY torbutton.prefs.cookie_jars "Çerezleri korumalı "jar" dosyasında tut"> -<!ENTITY torbutton.prefs.cookie_protection "Seçmek için çerez seçenekleri dialogunu kullan"> -<!ENTITY torbutton.prefs.mmm_cookies "Çerezlerimi kendim yönetmek istiyorum (tehlikeli)"> -<!ENTITY torbutton.prefs.clear_cookies "Tor çalışırken tüm çerezleri temizle"> -<!ENTITY torbutton.prefs.disable_plugins "Tor çalışırken eklentileri devredışı bırak(kritik)"> -<!ENTITY torbutton.prefs.kill_bad_js "Tehlikeli javascriptleri yakala(kritik)"> -<!ENTITY torbutton.prefs.isolate_content "Tor çalışırken dinamik içeriği koru(kritik)"> -<!ENTITY torbutton.prefs.no_updates "Tor çalışırken güncellemeleri devredışı bırak"> -<!ENTITY torbutton.prefs.set_uagent "Tor kullanımı için arabirim ayarla(kritik)"> -<!ENTITY torbutton.prefs.dynamic "Dinamik içerik"> +<!ENTITY torbutton.prefs.block_thread "Tor kullanılırken geçmiş okunamasın (önemli)"> +<!ENTITY torbutton.prefs.block_thwrite "Tor kullanılırken geçmiş kaydedilemesin (önerilir)"> +<!ENTITY torbutton.prefs.block_nthread "Tor-Dışı kullanılırken geçmiş okunamasın (isteğe bağlı)"> +<!ENTITY torbutton.prefs.block_nthwrite "Tor-Dışı kullanılırken geçmiş kaydedilemesin (isteğe bağlı)"> +<!ENTITY torbutton.prefs.clear_history "Tor durumu değiştirildiğinde geçmiş temizlensin (önerilir)"> +<!ENTITY torbutton.prefs.clear_cache "Tor durumu değiştirildiğinde Tor disk ön belleği engellenip tüm ön bellekler temizlensin"> +<!ENTITY torbutton.prefs.block_cache "Tor kullanılırken disk ve ön bellek erişimi engellensin"> +<!ENTITY torbutton.prefs.cookie_jars "Tor-Dışı çerezler korumalı bir jar dosyasında saklansın"> +<!ENTITY torbutton.prefs.cookie_protection "Seçmek için Çerez Koruması penceresini kullanın"> +<!ENTITY torbutton.prefs.mmm_cookies "Çerezlerimi kendim yöneteceğim (tehlikeli)"> +<!ENTITY torbutton.prefs.clear_cookies "Tor durumu değiştirildiğinde tüm çerezler temizlensin"> +<!ENTITY torbutton.prefs.disable_plugins "Tor kullanılırken uygulama ekleri devre dışı bırakılsın (önemli)"> +<!ENTITY torbutton.prefs.kill_bad_js "Tehlikeli javascriptler yakalansın (önemli)"> +<!ENTITY torbutton.prefs.isolate_content "Tor çalışırken devingen içerik korunsun (önemli)"> +<!ENTITY torbutton.prefs.no_updates "Tor kullanılırken güncellemeler devre dışı bırakılsın"> +<!ENTITY torbutton.prefs.set_uagent "Tor kullanılırken bildirilecek kullanıcı yazılımı (önemli)"> +<!ENTITY torbutton.prefs.dynamic "Devingen İçerik"> <!ENTITY torbutton.prefs.cookies "Çerezler"> -<!ENTITY torbutton.prefs.cache "Önbellek"> +<!ENTITY torbutton.prefs.cache "Ön bellek"> <!ENTITY torbutton.prefs.history "Geçmiş"> -<!ENTITY torbutton.prefs.no_search "Arama yaparken "öneriler" özelliğini devredışı bırak(tavsiye edilen)\"> +<!ENTITY torbutton.prefs.no_search "Tor kullanılırken arama önerileri devre dışı bırakılsın (önerilir)"> <!ENTITY torbutton.prefs.shutdown "Kapat"> -<!ENTITY torbutton.prefs.tor_shutdown "Etkin-Devredışı bırakırken tüm çerezleri temizle"> -<!ENTITY torbutton.prefs.all_shutdown "Tarayıcıyı kapattığımda tüm çerezleri temizle"> -<!ENTITY torbutton.prefs.no_shutdown "Programı kapatığımda çerezlerimi silme"> -<!ENTITY torbutton.prefs.disable_sessionstore "Oturum kaydı devredışı(tavsiye edilen)"> -<!ENTITY torbutton.prefs.headers "Başlık Bilgileri"> -<!ENTITY torbutton.prefs.spoof_english "İngilizce Web Tarayıcılarını Aldat"> -<!ENTITY torbutton.prefs.refererspoofing "Kastedilmiş Bilgi Hırsızlığı"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> -<!ENTITY torbutton.prefs.smartspoof "Tor kullanırken akıllı referans aldatmacası kullan (siteler arası referansları aldatır)"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> -<!ENTITY torbutton.prefs.disable_domstorage "Tor çalışırken DCOM belleğini devredışı bırak(kritik)"> +<!ENTITY torbutton.prefs.tor_shutdown "Tor kullanılıan tarayıcı kapatılırken Tor çerezleri temizlensin"> +<!ENTITY torbutton.prefs.all_shutdown "Tüm tarayıcılar kapatılırken tüm çerezler temizlensin"> +<!ENTITY torbutton.prefs.no_shutdown "Programı kapatığımda çerezlerim silinmesin"> +<!ENTITY torbutton.prefs.disable_sessionstore "Oturum Kaydedilmesin (önerilir)"> +<!ENTITY torbutton.prefs.headers "Üst Bilgiler"> +<!ENTITY torbutton.prefs.spoof_english "Amerikan İngilizce Web Tarayıcısı Aldatması"> +<!ENTITY torbutton.prefs.refererspoofing "Gönderici aldatması"> +<!ENTITY torbutton.prefs.spoofblank "Tor kullanılırken boş gönderici aldatması yapılsın (bazı sitelerde çalışmayabilir)"> +<!ENTITY torbutton.prefs.smartspoof "Tor kullanılırken akıllı gönderici aldatması yapılsın (siteler arası göndericileri değiştirir)"> +<!ENTITY torbutton.prefs.nospoof "Tor kullanılırken gönderici aldatması yapılmasın (normal gönderici iletilir)"> +<!ENTITY torbutton.prefs.disable_domstorage "Tor kullanılırken DCOM belleği devre dışı bırakılsın (önemli)"> <!ENTITY torbutton.prefs.forms "Formlar"> -<!ENTITY torbutton.prefs.block_tforms "Tor kullanılırken şifreleri kaydetme(önerilen)"> -<!ENTITY torbutton.prefs.block_ntforms "Tor çalışmıyorken şifreleri kaydetme(isteğe bağlı)"> +<!ENTITY torbutton.prefs.block_tforms "Tor kullanılırken parola ve formların kaydedilmesi engellensin (önerilen)"> +<!ENTITY torbutton.prefs.block_ntforms "Tor-Dışı parola ve formların kaydedilmesi engellensin (isteğe bağlı)"> <!ENTITY torbutton.prefs.tor "Tor"> -<!ENTITY torbutton.prefs.non_tor "Non-Tor"> -<!ENTITY torbutton.prefs.restore_tor "Oturumunda restore başlangıç, Tor devlet ayarlamak için:"> -<!ENTITY torbutton.prefs.startup_tor "Tarayıcı başlatıldığında Tor durumunu şu şekilde ayarla:"> -<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox çöktüğünde, çerezleri "jar" dosyalarından geri yükle(Tavsiye edilen)"> -<!ENTITY torbutton.prefs.dual_cookie_jars "Tüm çerezleri korunan jar dosyalarında tut(tehlikeli)"> -<!ENTITY torbutton.prefs.clear_http_auth "HTTP oturum doğrulamalarının tümünü temizle(önerilen)"> -<!ENTITY torbutton.prefs.block_js_history "Tor çalışıyorken geçmiş bilgisinde gezinmeyi yasakla(kritik)"> -<!ENTITY torbutton.prefs.resize_on_toggle "Tor kullanırken pencereleri 50px'le ölçekle (önerilen)"> -<!ENTITY torbutton.prefs.close_tor "Tor aktif olduğunda tüm pencereleri temizle (önerilen)"> -<!ENTITY torbutton.prefs.close_nontor "Kapatmak tüm Sigara Tor pencereleri ve sekmeleri toggle (isteğe bağlı)"> -<!ENTITY torbutton.prefs.block_links "Blok link tıklama ve farklı Tor devletler (isteğe bağlı), sayfa yeniden yükler "> -<!ENTITY torbutton.prefs.jar_certs "Tor / Non-Tor için ayrı kavanozlarda saklayın SSL certs (tavsiye)"> -<!ENTITY torbutton.prefs.jar_ca_certs "Tor / Non-Tor için ayrı kavanozlarda saklayın CA certs (önerilir) "> -<!ENTITY torbutton.prefs.locked_mode "Sakatlar Düğme ve Hotkeys yanlışlıkla geçiş önlemek için"> -<!ENTITY torbutton.prefs.startup_state "Normal çalışmaya başlayınca, Tor devlet ayarlamak için:"> -<!ENTITY torbutton.prefs.shutdown_state "Kapatma devlet "> +<!ENTITY torbutton.prefs.non_tor "Tor-Dışı"> +<!ENTITY torbutton.prefs.restore_tor "Başlangıçta oturum geri yüklendiğinde ayarlanacak Tor durumu:"> +<!ENTITY torbutton.prefs.startup_tor "Tarayıcı başlatıldığında ayarlanacak Tor durumu:"> +<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox çöktüğünde, çerezler jar dosyasından yüklensin ya da temizlensin (önerilir)"> +<!ENTITY torbutton.prefs.dual_cookie_jars "Tor ve Tor-Dışı tüm çerezler korunan jar dosyalarında saklansın (tehlikeli)"> +<!ENTITY torbutton.prefs.clear_http_auth "Kimliği doğrulanmış tüm HTTP oturumları temizlensin (önerilir)"> +<!ENTITY torbutton.prefs.block_js_history "Geçmiş bilgilerine erişim Tor durumuna göre engellensin (önemli)"> +<!ENTITY torbutton.prefs.resize_on_toggle "Tor kullanırken pencereler 50 piksel ve katlarıyla boyutlandırılsın (önerilir)"> +<!ENTITY torbutton.prefs.close_tor "Tor durumu değişikliğinde tüm Tor pencere ve sekmeleri kapatılsın (isteğe bağlı)"> +<!ENTITY torbutton.prefs.close_nontor "Tor durumu değişikliğinde tüm Tor-Dışı pencere ve sekmeler kapatılsın (isteğe bağlı)"> +<!ENTITY torbutton.prefs.block_links "Farklı Tor durumlarında bağlantılara tıklama ve sayfayı yenileme engellensin (isteğe bağlı)"> +<!ENTITY torbutton.prefs.jar_certs "Tor/Tor-Dışı durumların SSL sertifikaları ayrı jar dosyalarında saklansın (önerilir)"> +<!ENTITY torbutton.prefs.jar_ca_certs "Tor/Tor-Dışı durumların CA sertifikaları ayrı ayrı jar dosyalarında saklansın (önerilir)"> +<!ENTITY torbutton.prefs.locked_mode "İstenmeyen durum değişikliğini engellemek için düğme ve kısayol tuşları devre dışı bırakılsın"> +<!ENTITY torbutton.prefs.startup_state "Normal başlangıçta ayarlanacak Tor durumu:"> +<!ENTITY torbutton.prefs.shutdown_state "Kapanış durumu"> <!ENTITY torbutton.prefs.startup "Başlangıç"> -<!ENTITY torbutton.prefs.block_tor_file_net "Dosyadan Tor ağ erişimi file:// url (önerilir)"> -<!ENTITY torbutton.prefs.block_nontor_file_net "Dosyadan non-Tor ağ erişimi file:// url (önerilir)"> -<!ENTITY torbutton.prefs.restore_defaults "Varsayılan Ayarlar"> -<!ENTITY torbutton.prefs.test_settings "Ayarları test et"> -<!ENTITY torbutton.prefs.test_auto "Her ateş başlar toggle ilk defa sonra Test benim Tor ayarları"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.tor_memory_jar "Diske Tor çerezleri yazmayın "> -<!ENTITY torbutton.prefs.nontor_memory_jar "Diske Non-Tor çerezleri yazmayın"> -<!ENTITY torbutton.prefs.session_restore "Kurtarmak oturum mağaza var ve bu sekmeleri geri yükleme:"> -<!ENTITY torbutton.prefs.nontor_tabs "Sekmeler Non-Tor yüklendi"> -<!ENTITY torbutton.prefs.tor_tabs "Sekmeler Tor yüklendi"> +<!ENTITY torbutton.prefs.block_tor_file_net "file:// İnternet adresleri yoluyla Tor ağ erişimi engellensin (önerilir)"> +<!ENTITY torbutton.prefs.block_nontor_file_net "file:// İnternet adresleri yoluyla Tor-Dışı ağ erişimi engellensin"> +<!ENTITY torbutton.prefs.restore_defaults "Varsayılanları Yükle"> +<!ENTITY torbutton.prefs.test_settings "Ayarları Sına"> +<!ENTITY torbutton.prefs.test_auto "İlk durum değişikliğinden sonra Firefox her başlatıldığında Tor ayarlarım sınansın"> +<!ENTITY torbutton.prefs.disable_livemarks "Tor kullanılırken livemarks güncellemeleri devre dışı bırakılsın"> +<!ENTITY torbutton.prefs.tor_memory_jar "Tor çerezleri diske yazılmasın"> +<!ENTITY torbutton.prefs.nontor_memory_jar "Tor-Dışı çerezler diske yazılmasın"> +<!ENTITY torbutton.prefs.session_restore "Oturum kaydında şu sekmeler kaydedilip geri yüklensin:"> +<!ENTITY torbutton.prefs.nontor_tabs "Tor-Dışı Yüklenen Sekmeler"> +<!ENTITY torbutton.prefs.tor_tabs "Tor İle Yüklenen Sekmeler"> <!ENTITY torbutton.prefs.socks_vfour "SOCKS v4"> <!ENTITY torbutton.prefs.socks_vfive "SOCKS v5"> <!ENTITY torbutton.prefs.no_proxies_on "Şunun için vekil sunucu yok:"> -<!ENTITY torbutton.prefs.no_proxy_warning "Uyarı: Yukarıdaki alan adlarını kullanmaktan kaçının"> -<!ENTITY torbutton.prefs.spoofreresh "Aldatmaca Yenile"> -<!ENTITY torbutton.prefs.refereroptions "Referans Aldatmacası Ayarları"> -<!ENTITY torbutton.prefs.nospoof "No referer spoof during Tor usage (sends referers as normal)"> -<!ENTITY torbutton.prefs.spoofroot "Geçerli klasör için aldatmaca kullan"> -<!ENTITY torbutton.prefs.spoofdomain "Referans olarak alanı aldat"> -<!ENTITY torbutton.prefs.spoofblank "Spoof blank referer during Tor usage (may break some sites)"> -<!ENTITY torbutton.cookiedialog.title "Çerez Korumasını Yönet"> -<!ENTITY torbutton.cookiedialog.lockCol "Korunan"> +<!ENTITY torbutton.prefs.no_proxy_warning "Uyarı: Yukarıdaki sunucu adlarını kullanmaktan kaçının"> +<!ENTITY torbutton.prefs.spoofreresh "Aldatma Yenileme"> +<!ENTITY torbutton.prefs.refereroptions "Gönderici Aldatma Ayarları"> +<!ENTITY torbutton.prefs.nospoof "Tor kullanılırken gönderici aldatması yapılmasın (normal gönderici iletilir)"> +<!ENTITY torbutton.prefs.spoofroot "Sayfayı içeren klasörü aldat"> +<!ENTITY torbutton.prefs.spoofdomain "Etki alanını gönderici olarak aldat"> +<!ENTITY torbutton.prefs.spoofblank "Tor kullanılırken boş gönderici aldatması yapılsın (bazı sitelerde çalışmayabilir)"> +<!ENTITY torbutton.cookiedialog.title "Çerez Koruması Yönetimi"> +<!ENTITY torbutton.cookiedialog.lockCol "Korunmuş"> <!ENTITY torbutton.cookiedialog.domainCol "Sunucu"> -<!ENTITY torbutton.cookiedialog.nameCol "İsim"> +<!ENTITY torbutton.cookiedialog.nameCol "Ad"> <!ENTITY torbutton.cookiedialog.pathCol "Yol"> <!ENTITY torbutton.cookiedialog.protectCookie "Çerezi Koru"> <!ENTITY torbutton.cookiedialog.removeCookie "Çerezi Sil"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Çerezi Korumayı Sonlandır"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar Hariç Tümünü Sil"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni çerezleri koru"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni çerezleri koruma"> -<!ENTITY torbutton.prefs.disable_livemarks "Disable livemarks updates during Tor usage"> -<!ENTITY torbutton.prefs.dtd_recommended "(önerilen)"> +<!ENTITY torbutton.cookiedialog.unprotectCookie "Çerez Korumasını Kaldır"> +<!ENTITY torbutton.cookiedialog.removeAllBut "Korunanlar Dışında Tümünü Sil"> +<!ENTITY torbutton.cookiedialog.saveAllCookies "Yeni Çerezleri Koru"> +<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Yeni Çerezleri Koruma"> +<!ENTITY torbutton.prefs.disable_livemarks "Tor kullanılırken livemarks güncellemeleri devre dışı bırakılsın"> +<!ENTITY torbutton.prefs.dtd_recommended "(önerilir)"> <!ENTITY torbutton.prefs.dtd_optional "(isteğe bağlı)"> -<!ENTITY torbutton.prefs.dtd_crucial "(kritik)"> -<!ENTITY torbutton.prefs.update_torbutton_via_tor "Tor üzerinden yönlendirme Torbutton güncellemeleri"> -<!ENTITY torbutton.prefs.dodge_google_captcha "Otomatik olarak alternatif bir arama motoru Google Captcha başvurdu kullanın:"> +<!ENTITY torbutton.prefs.dtd_crucial "(önemli)"> +<!ENTITY torbutton.prefs.update_torbutton_via_tor "Torbutton güncellemeleri Tor üzerinden yapılsın"> +<!ENTITY torbutton.prefs.dodge_google_captcha "Google Captcha sunulduğunda otomatik olarak başka bir arama motoru kullanılsın:"> <!ENTITY torbutton.prefs.engine1 "ixquick.com"> <!ENTITY torbutton.prefs.engine2 "Bing.com"> <!ENTITY torbutton.prefs.engine3 "Yahoo.com"> <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> -<!ENTITY torbutton.prefs.fix_google_srch "Kaldır platform ve Google Arama Kutusu gelen dil sorgular"> -<!ENTITY torbutton.prefs.transparentTor "Şeffaf Torifikasyon (özel transproxy veya Tor yönlendiricisi gerekir)"> +<!ENTITY torbutton.prefs.fix_google_srch "Google Arama Kutusu sorgularında platform ve dil bilgileri ayıklansın"> +<!ENTITY torbutton.prefs.transparentTor "Saydam Tor İletişimi (özel transproxy yada Tor yönelticisi gerekir)"> <!ENTITY torbutton.prefs.priv_caption "Gizlilik Ayarları"> -<!ENTITY torbutton.prefs.block_disk "Tarama geçmişini ve web sitesi bilgilerini kaydetme (Özel Tarama Kipi'ni etkinleştirir)"> -<!ENTITY torbutton.prefs.restrict_thirdparty "3. parti çerezleri ve diğer iz sürücü bilgileri engelle"> -<!ENTITY torbutton.prefs.block_plugins "Tarayıcı eklentilerini engelle (Flash benzeri)"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor kullanıcılardan sizi ayıran detayları değiştir"> -<!ENTITY torbutton.prefs.sec_caption "Güvenlik Seviyesi"> +<!ENTITY torbutton.prefs.block_disk "Tarama geçmişini ve web sitesi bilgileri kaydedilmesin (Gizli Tarama Kipi kullanılır)"> +<!ENTITY torbutton.prefs.restrict_thirdparty "3. taraf çerez ve diğer iz sürücü bilgiler engellensin"> +<!ENTITY torbutton.prefs.block_plugins "Tarayıcı eklentileri engellensin (Flash gibi)"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor Browser kullanıcılarından sizi ayıran ayrıntılar değiştirilsin"> +<!ENTITY torbutton.prefs.sec_caption "Güvenlik Düzeyi"> <!ENTITY torbutton.prefs.sec_low "Düşük (varsayılan)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "Bu en kullanılabilir deneyimi sunar."> -<!ENTITY torbutton.prefs.sec_low_desc "Bu güvenlik seviyesinde tüm tarayıcı özellikleri etkindir."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType yazı tipi işleme mekanizması devre dışı."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Bu seçenek en kullanılabilir deneyimi sunar."> +<!ENTITY torbutton.prefs.sec_low_desc "Bu güvenlik düzeyinde tüm tarayıcı özellikleri kullanılabilir."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType yazı tipi görüntüleme düzeneği devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_med_low "Orta-Düşük"> -<!ENTITY torbutton.prefs.sec_gen_desc "Bu güvenlik seviyesinde, aşağıdaki değişiklikler uygulanır (ayrıntılar için fare ile üzerine gelin):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video ve ses ortamı NoScript aracılığıyla tıkla ve oynat yapıldı."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Bazı sitelerde bu ortam nesnelerini etkinleştirebilmek için NoScript düğmesini kullanmanız gerekebilir."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Bazı JavaScript başarım iyileştirmeleri devre dışı."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Tür çıkarımı, ASM.JS."> +<!ENTITY torbutton.prefs.sec_gen_desc "Bu güvenlik düzeyinde, şu değişiklikler uygulanır (ayrıntılar için fare ile üzerlerinde dolaşın):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 görüntü ve ses ortamı NoScript aracılığıyla tıklayıp oynat şekline dönüştürülür."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Bazı sitelerde bu ortam nesnelerini etkinleştirebilmek için NoScript düğmesinin kullanılması gerekebilir."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Bazı JavaScript başarım iyileştirmeleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Sınır Çizgi JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> -<!ENTITY torbutton.prefs.sec_jar_desc "Uzak JAR dosyaları engellendi."> +<!ENTITY torbutton.prefs.sec_jar_desc "Uzak JAR dosyaları engellenir."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR dosyalarına ağda oldukça ender rastlanır, ancak XSS ve diğer saldırıların kaynağı olabilir."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini gösteren bazı mekanizmalar devre dışı."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_med_high "Orta-Yüksek"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "Tüm JavaScript başarım iyileştirmeleri devre dışı."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi işleme mekanizması devre dışı."> -<!ENTITY torbutton.prefs.sec_svg_desc "Bazı resim türleri devre dışı."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG resimleri devre dışı."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript öntanımlı olarak tüm HTTPS olmayan sitelerde devre dışı."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Tüm JavaScript başarım iyileştirmeleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Bazı yazı tipi işleme özellikleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite yazı tipi görüntüleme düzeneği devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_svg_desc "Bazı görsel tipleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG görselleri devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS kullanılmayan sitelerde JavaScript varsayılan olarak devre dışı bırakılır."> <!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript, NoScript araç çubuğu düğmesi kullanılarak her site için ayrı ayrı etkinleştirilebilir."> <!ENTITY torbutton.prefs.sec_high "Yüksek"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript öntanımlı olarak tüm sitelerde devre dışı."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Çoğu ses ve video biçimi devre dışı."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM, etkin bırakılan tek çözücü."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript varsayılan olarak tüm sitelerde devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "Çoğu ses ve görüntü biçimi devre dışı bırakılır."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "Kodlayıcı çözücü olarak yalnız WebM etkin bırakılır."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Bazı yazı tipi ve simgeler düzgün görüntülenemeyebilir."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web site tarafından sağlanan yazı tipi dosyaları engellenmiş."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web sitesi tarafından sunulan yazı tipi dosyaları engellenir."> <!ENTITY torbutton.prefs.sec_custom "Özel Değerler"> <!ENTITY torbutton.circuit_display.title "Bu site için Tor devresi"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index d78c07f..8c03698 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -1,78 +1,78 @@ -torbutton.button.tooltip.disabled = Tor'u Etkinleştir -torbutton.button.tooltip.enabled = Tor'u Devre Dışı Bırak +torbutton.button.tooltip.disabled = Tor Kullanılsın +torbutton.button.tooltip.enabled = Tor Kullanılmasın torbutton.circuit_display.internet = İnternet torbutton.circuit_display.ip_unknown = Bilinmeyen IP torbutton.circuit_display.onion_site = Soğan sitesi torbutton.circuit_display.this_browser = Bu tarayıcı -torbutton.circuit_display.relay = ayna +torbutton.circuit_display.relay = aktarıcı torbutton.circuit_display.tor_bridge = Köprü -torbutton.circuit_display.unknown_country = Bilinmeyen ülke -torbutton.content_sizer.margin_tooltip = Tor tarayıcı pencerenizin genişlik ve yüksekliğini daha az belirgin hala getirmek için marj ekler, ve çevrimiçi insanların sizi izleme yeteneğini azaltır. -torbutton.panel.tooltip.disabled = Tor'u etkinleştirmek için tıklayın -torbutton.panel.tooltip.enabled = Tor'u devre dışı bırakmak için tıklayın -torbutton.panel.plugins.disabled = Eklentileri etkinleştirmek için tıklayın -torbutton.panel.plugins.enabled = Eklentileri devre dışı bırakmak için tıklayın +torbutton.circuit_display.unknown_country = Bilinmeyen Ülke +torbutton.content_sizer.margin_tooltip = Tor Browser pencerenizin genişlik ve yüksekliğini daha az ayırt edilebilir duruma getirmek için kenar boşlukları ekleyerek kişilerin sizi çevrim içi olarak izleme yeteneğini azaltır. +torbutton.panel.tooltip.disabled = Tor yazılımını etkinleştirmek için tıklayın +torbutton.panel.tooltip.enabled = Tor yazılımını devre dışı bırakmak için tıklayın +torbutton.panel.plugins.disabled = Uygulama eklerini etkinleştirmek için tıklayın +torbutton.panel.plugins.enabled = Uygulama eklerini devre dışı bırakmak için tıklayın torbutton.panel.label.disabled = Tor Devre Dışı torbutton.panel.label.enabled = Tor Etkin -extensions.torbutton(a)torproject.org.description = Torbutton Tor ayarlarını yapabileceğiniz ve hızlı ve kolayca gizli tarama verilerini silebileceğiniz bir düğme sağlar. -torbutton.popup.history.warning = Torbutton, farklı bir Tor durumunda yüklenmiş bir sekmeden gelen etkinliği engelledi.\n\nBu Firefox 409737 ve 417869 nolu hata raporlarını için bir çözümdür.\n\nHiçbir sebep yokken bu uyarı aldıysanız, muhtelemelen sekme kendini yenilemeye çalıştığı için engellenmiş olabilir.\n\nSekmeyi yenilemek için lütfen adres çubuğunu tıklayıp 'enter' tuşuna basın.\n\n -torbutton.popup.plugin.warning = Torbutton Tor'un eklenti içeriğini yüklemesini blokladı.\n\nFarklı Kaydet ile yapmayı deneyin.\n\n -torbutton.popup.confirm_ca_certs = Torbutton hatırlatma: Anlaşılan özel sertifakanız yok. Doğrulama bilgisi her zaman işlemleri yavaşlatır. Sertifika doğrulamalarını devredışı bırakmak ister misiniz? (Açıklamayı anlamadıysan, Tamam'a tıkla)\n -torbutton.popup.ff3.warning = Dikkat!\n\nFirefox 3'teki Torbutton yerel saatinizi ve bazı yerel bilgilerinizi gizlice gönderebilir?\n\nDevam etmek istiyor musunuz? -torbutton.popup.toggle.warning = Ayarların uygulanması için Tor'u yeniden başlatmanız gerekiyor.\n -torbutton.popup.test.success = Vekil sunucu testi başarılı! -torbutton.popup.test.failure = Vekil sunucu testi başarısız oldu! Lütfen Vekil sunucunuzu ve Polippo ayarlarını kontrol ediniz. -torbutton.popup.test.confirm_toggle = En son Tor vekil sunucu testi Tor kullanımında başarısız oldu.\n\nYine de etkinleştirmek ister misiniz?\n\nNot: Eğer sorunu çözdüyseniz bu uyarıyı yok etmek için Torbutton Vekil Sunucu Tercihlerinden sınamayı tekrar çalıştırabilirsiniz. -torbutton.popup.test.ff3_notice = Tamam tıklayarak vekil sunucu ayarlarını test edin. Bu sınama arkaplanda yapılacak. Lütfen sabırlı olun. -torbutton.panel.label.verified = Doğrulandı -torbutton.popup.test.auto_failed = Otomatik gerçekleşen vekil sunucu Tor kullanma testi başarız oldu.\n\nYine de etkinleştirmek ister misiniz? +extensions.torbutton(a)torproject.org.description = Torbutton, Tor ayarlarını yapabileceğiniz ve kişisel tarama verilerini hızlı ve kolayca silebileceğiniz bir düğme sunar. +torbutton.popup.history.warning = Torbutton, farklı bir Tor durumunda yüklenmiş bir sekmeden gelen etkinliği engelledi.\n\nBu durum Firefox 409737 ve 417869 numaralı hata raporlarını için bir çözümdür.\n\nHiçbir neden olmadan bu uyarıyı aldıysanız, sekme kendini yenilemeye çalıştığı için engellenmiş olabilir.\n\nSekmeyi bu Tor durumunda yenilemek için adres çubuğuna tıklayıp 'enter' tuşuna basın.\n\n +torbutton.popup.plugin.warning = Torbutton, uygulama eki içeriğinin doğrudan Tor tarafından yüklemesini engelledi.\n\nBunun yerine Farklı Kaydet kullanmayı deneyin.\n +torbutton.popup.confirm_ca_certs = Torbutton Notu: Özel bir Sertifika Otoriteniz yok gibi görünüyor. Sertifika Otoriteleri listesini sınamak uzun süren ve Tor durum değişikliğini yavaşlatan bir işlemdir. Sertifika Otoritesi sertifikalarının yalıtılmasını devre dışı bırakmak ister misiniz? (bunun ne olduğunu anlamadıysanız Tamam' üzerine tıklamak güvenlidir) +torbutton.popup.ff3.warning = Uyarı!\n\nFirefox 3 üzerinde Torbutton, yerel saat ve bazı yerel bilgilerinizi (livemark) sızdırabilir\n\nDevam etmek istiyor musunuz? +torbutton.popup.toggle.warning = Ayar değişikliklerinin geçerli olması için Tor durumunu değiştirmeli ya da yeniden başlatmalısınız. +torbutton.popup.test.success = Tor vekil sunucu sınaması başarılı! +torbutton.popup.test.failure = Tor vekil sunucu sınaması başarısız oldu! Lütfen vekil sunucunuzu ve Polipo ayarlarını denetleyin. +torbutton.popup.test.confirm_toggle = Son Tor vekil sunucu sınamasında Tor kullanılamadı.\n\nYine de etkinleştirmek ister misiniz?\n\nNot: Sorunu çözdüyseniz bu uyarıyı kaldırmak için Torbutton Vekil Sunucu Ayarları bölümünden sınamayı yeniden yapabilirsiniz. +torbutton.popup.test.ff3_notice = Tor vekil sunucu ayarlarını sınamak için Tamam üzerine tıklayın. Bu sınama artalanda yapılacak. Lütfen sabırlı olun. +torbutton.panel.label.verified = Tor Doğrulandı +torbutton.popup.test.auto_failed = Otomatik Tor vekil sunucu sınamasında Tor kullanılamadı.\n\nYine de etkinleştirmek ister misiniz? torbutton.prefs.recommended = (önerilir) torbutton.prefs.optional = (isteğe bağlı) -torbutton.prefs.crucial = (gerekli) -torbutton.popup.external.title = Harici bir dosya türü indirilsin mi? -torbutton.popup.external.app = Tor Tarayıcı bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n\n -torbutton.popup.external.note = Bazı dosya türleri, uygulamaların Tor kullanmaksızın İnternet'e bağlanmalarına sebep olabilir.\n\n -torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları sadece çevrimdışı iken açmalı veya Tails benzeri bir Tor Çalışır CD kullanmalısınız.\n +torbutton.prefs.crucial = (önemli) +torbutton.popup.external.title = Dış bir dosya tipi indirilsin mi? +torbutton.popup.external.app = Tor Browser bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n +torbutton.popup.external.note = Bazı dosya tipleri uygulamaların Tor kullanmadan İnternet bağlantısı kurmasına neden olabilir.\n\n +torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları yalnız çevrim dışı iken açmalı ya da Tails benzeri bir Çalışan Tor CD ortamı kullanmalısınız.\n torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n -torbutton.popup.dontask = Artık dosyaları otomatik indir -torbutton.popup.test.no_http_proxy = Vekil sunucu sınaması: Yerel vekil sunucuya ulaşımıyor. Polippo düzgün çalışıyormu? -torbutton.popup.captcha.title = Google Captcha'dan kaçın -torbutton.popup.captcha.ask = Google Captcha algılandı. Aramana devam etmek için başka bir arama moturuna yönlendirmek istermisin? -torbutton.popup.captcha.always = Bu ayarı şu andan itibaren sürekli hale getir\n -torbutton.popup.redirect = Yönlendir -torbutton.popup.no_redirect = Yönlendirme -torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce sürümlerini göstermeyi talep edebilir. Bu özellik, sayfaların ana diliniz yerine İngilizce görüntülenmesine sebep olabilir.\n\nDaha iyi gizlilik için sayfaların İngilizce sürümlerinin talep edilmesini ister misiniz? -torbutton.popup.no_newnym = Torbutton size güvenli yeni bir kimlik sağlayamadı. Tor Control Port una giriş yapılamıyor.\n\nTor Browser Bundle nin çalıştığından emin olun. -torbutton.popup.use_tbb = Görünüşe göre Torbutton'ı Firefox ile kullanıyorsunuz, bu tavsiye edilen bir güvenlik ayarlaması değildir.\n\nAslında, Size tavsiyemiz Tor Tarayıcısını gettor(a)torproject.org adresine e-posta göndererek veya şu adrese girerek edinmenizdir. -torbutton.popup.pref_error = Torbutton, Tor Browser profil klasörünün içinde seçenekleri güncelleyemez. -torbutton.popup.permission_denied = Lütfen Tor Browser klasörünün izinlerini sıfırlayın ya da O nu farklı bir konuma taşıyın. -torbutton.popup.device_full = Disk dolu gözüküyor. Lütfen diskte yer açın ya da Tor Browser i farklı bir konuma taşıyın. +torbutton.popup.dontask = Bundan sonra dosyalar otomatik indirilsin +torbutton.popup.test.no_http_proxy = Tor vekil sunucu sınaması: Yerel HTTP vekil sunucusuna ulaşılamıyor. Polipo düzgün çalışıyor mu? +torbutton.popup.captcha.title = Google Captcha Kaçınması +torbutton.popup.captcha.ask = Torbutton Google Captcha uygulamasını algıladı. Bu aramanın başka bir arama motoruna yönlendirilmesini ister misiniz? +torbutton.popup.captcha.always = Bundan sonra hep şu işlem yapılsın +torbutton.popup.redirect = Yönlendirilsin +torbutton.popup.no_redirect = Yönlendirilmesin +torbutton.popup.prompted_language = Daha fazla gizlilik icin, Torbutton sayfaların İngilizce sürümlerini göstermeyi isteyebilir. Bu özellik, web sayfalarının ana diliniz yerine İngilizce görüntülenmesine neden olabilir.\n\nDaha iyi gizlilik için web sayfalarının İngilizce sürümlerinin görüntülenmesini ister misiniz? +torbutton.popup.no_newnym = Torbutton size yeni bir güvenli kimlik sağlayamadı. Tor Denetim Kapısına giriş yapılamıyor.\n\nTor Browser Bundle yazılımını çalıştırdığınıza emin olun. +torbutton.popup.use_tbb = Firefox üzerinde Torbutton kullanıyorsunuz gibi görünüyor. Bu ikili artık önerilen bir güvenli kullanım sağlamıyor.\n\nBunun yerine, gettor(a)torproject.org adresine e-posta göndererek ya da şu adresten indirerek son Tor Browser Bundle yazılımını edinmeniz önerilir. +torbutton.popup.pref_error = Torbutton, Tor Browser profil klasörünün içindeki ayarları güncelleyemedi. +torbutton.popup.permission_denied = Lütfen Tor Browser klasörünün izinlerini sıfırlayın ya da başka bir konuma taşıyın. +torbutton.popup.device_full = Disk dolmuş görünüyor. Lütfen diskte yer açın ya da Tor Browser yazılımını başka bir aygıt üzerine taşıyın. torbutton.title.prompt_torbrowser = Önemli Torbutton Bilgisi -torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: artık kapatamıyorsunuz.\n\nBu değişikliği yaptık çünkü Tor kullanmadan da kullanılan tarayıcıyı Torbutton ile kullanmak güvenli değil. Başka türlü çözemeyeceğimiz birçok hata vardı.\n\nFirefox'u normal olarak kullanmak istiyorsanız, Torbutton'ı silmeli ve Tor Tarayıcı Paketini indirebilrsiniz. Tor tarayıcısının gizlilik ayarları da normal Firefox'dan, hatta Torbutton ile kullanan Firefox'dan daha üstün.\n\nTorbutton'ı kaldırmak için, Araçlar->Eklentiler->Uzantılar'a gidin ve Torbutton'ın yanındaki Kaldır düğmesine tıklayın. -torbutton.popup.short_torbrowser = Önemli Torbutton bilgisi!\nTorbutton şimdi tamamen etkinleştirildi.\nDaha fazla bilgi için Torbutton'a tıklayınız. +torbutton.popup.prompt_torbrowser = Torbutton şimdi farklı çalışıyor: artık kapatamıyorsunuz.\n\nBu değişikliği yapmamızın nedeni Tor-Dışı kullanılan bir tarayıcıda Torbutton kullanmanın güvenli olmaması. Başka türlü çözemeyeceğimiz birçok hata vardı.\n\nFirefox tarayıcısını normal olarak kullanmak istiyorsanız, Torbutton yazılımını kaldırıp Tor Browser Bundle paketini indirebilirsiniz. Tor Browser gizlilik özellikleri normal Firefox tarayıcısına, hatta Torbutton ile kullanan Firefox ikilisine göre çok daha üstündür.\n\nTorbutton yazılımını kaldırmak için, Araçlar->Eklentiler->Uzantılar bölümüne gidin ve Torbutton yazılımının yanındaki Kaldır düğmesine tıklayın. +torbutton.popup.short_torbrowser = Önemli Torbutton Bilgisi!\n\nTorbutton artık kapatılamayacak şekilde etkinleştirildi.\n\nAyrıntılı bilgi almak için Torbutton üzerine tıklayın. -torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve anonimliğinizi zedeleyebilir.\n\nAynı zaman Tor'u atlatarak geçerli konumunuzu ve IP adresinizi ortaya çıkarabilir.\n\nEklentileri aktif etmek istiyor musunuz?\n +torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve anonim kimliğinizi zedeleyebilir.\n\nBu eklentiler Tor yazılımını atlatarak geçerli konum ve IP adresinizi ortaya çıkarabilir.\n\nBu eklentileri etkinleştirmek istediğinize emin misiniz?\n torbutton.popup.never_ask_again = Bir daha sorma -torbutton.popup.confirm_newnym = Tor Tarayıcısı tüm sekmeleri ve pencereleri kapatacak. Tüm web sitesi oturumları kaybolacaktır.\n\nOturumunuzu sıfırlamak için Tor tarayıcı yeniden başlatılsın mı?\n +torbutton.popup.confirm_newnym = Tor Browser tüm sekme ve pencereleri kapatacak. Tüm web sitesi oturumları kaybolacak.\n\nKimliğinizi sıfırlamak için Tor Browser yeniden başlatılsın mı?\n -torbutton.slider_notification = Yeşil soğan menüsü artık güvenlik seviyesini ayarlayabileceğiniz bir güvenlik kaydırıcısını içeriyor. Deneyin! +torbutton.slider_notification = Yeşil soğan menüsünde artık güvenlik düzeyini ayarlayabileceğiniz bir güvenlik kaydırıcısı var. Deneyin! torbutton.slider_notification_button = Güvenlik ayarlarını aç -torbutton.maximize_warning = Tor Tarayıcısı'nın ekranı kaplamasını etkinleştirmek web sitelerinin ekran boyutunuzu öğrenmesine; dolayısıyla sizi izlemede bu bilgiyi kullanmalarını sağlayabilir. Tor Tarayıcı pencerelerini özgün varsayılan boyutlarında bırakmanızı tavsiye ediyoruz. +torbutton.maximize_warning = Tor Browser görüntüsünün tüm ekranı kaplaması, ekran boyutunuzu web siteleri tarafından öğrenilmesini ve bu bilginin sizi izlemek için kullanılmasını sağlayabilir. Tor Browser pencerelerini özgün varsayılan boyutlarında bırakmanız önerilir. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki resim verisine erişmeye çalıştı.\n\nTor Tarayıcı bu web sitesine HTML5 tuval resim verisini çıkarmasına izin vermeli mi? +canvas.siteprompt=Bu web sitesi (%S) bilgisayarınızı benzersiz olarak tanımlayabilmek için kullanılabilen HTML5 tuvalindeki görsel verisine erişmeye çalıştı.\n\nTor Browser bu web sitesine HTML5 tuval, görsel verisini göndersin mi? canvas.notNow=Şimdi Değil -canvas.notNowAccessKey=H -canvas.allow=İleride izin ver -canvas.allowAccessKey=H -canvas.never=Bu site için asla (önerilen) -canvas.neverAccessKey=a +canvas.notNowAccessKey=N +canvas.allow=İleride izin verilsin +canvas.allowAccessKey=A +canvas.never=Bu site için asla (önerilir) +canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profil Sorunu -profileReadOnly=%S salt okunur bir sistemden çalıştırılamaz. Lütfen kullanmadan önce %S ögesini farklı bir konuma kopyalayın. -profileReadOnlyMac=%S salt okunur bir sistemden çalıştırılamaz. Lütfen kullanmadan önce %S ögesini Masaüstü veya Uygulamalar klasörüne kopyalayın. -profileAccessDenied=%S, profilinize erişemiyor. Lütfen sistem yetkilerinizi ayarlayın ve yeniden deneyin. +profileProblemTitle=%S Profili Sorunu +profileReadOnly=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını farklı bir konuma kopyalayın. +profileReadOnlyMac=%S salt okunur bir dosya sisteminden çalıştırılamaz. Lütfen kullanmadan önce %S yazılımını Masaüstü veya Uygulamalar klasörüne kopyalayın. +profileAccessDenied=%S, profilinize erişemiyor. Lütfen dosya sistemi izinlerini ayarlayarak yeniden deneyin.

1 0

[torbutton/master] Version bump; CHANGELOG updates
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit fb7dc83343223eab43347426c031a04cbb695c0a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 21:15:55 2015 +0000 Version bump; CHANGELOG updates --- src/CHANGELOG | 11 +++++++++++ src/install.rdf | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index ccee56d..05472f6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,14 @@ +1.9.3.3 + * Bug 14429: Make sure the automatic resizing is enabled + +1.9.3.2 + * Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click + * Bug 16730: Reset NoScript whitelist on upgrade + * Bug 16722: Prevent "Tiles" feature from being enabled after upgrade + * Bug 16488: Remove "Sign in to Sync" from the browser menu (fixup) + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + 1.9.3.1 * Bug 16268: Show Tor Browser logo on About page * Bug 16639: Check for Updates menu item can cause update failure diff --git a/src/install.rdf b/src/install.rdf index 4fd6fbe..56eefbe 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.3.1</em:version> + <em:version>1.9.3.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-launcher/master] Update translations
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit f2c6e09dd7119dc8178c368058a9de1bc3fd4cca Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 19:44:00 2015 +0000 Update translations --- src/chrome/locale/da/network-settings.dtd | 4 +- src/chrome/locale/fi/network-settings.dtd | 4 +- src/chrome/locale/hr-HR/network-settings.dtd | 4 +- src/chrome/locale/id/network-settings.dtd | 6 +- src/chrome/locale/lv/network-settings.dtd | 8 +-- src/chrome/locale/nl-BE/network-settings.dtd | 6 +- src/chrome/locale/nl-BE/progress.dtd | 6 +- src/chrome/locale/nl-BE/torlauncher.properties | 8 +-- src/chrome/locale/ro/network-settings.dtd | 6 +- src/chrome/locale/sk/network-settings.dtd | 12 ++-- src/chrome/locale/sk/progress.dtd | 4 +- src/chrome/locale/sr/network-settings.dtd | 6 +- src/chrome/locale/tr/network-settings.dtd | 72 ++++++++++++------------ src/chrome/locale/tr/progress.dtd | 4 +- src/chrome/locale/tr/torlauncher.properties | 64 ++++++++++----------- src/chrome/locale/uk/network-settings.dtd | 4 +- 16 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 33500b8..f9baa01 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Dette vil virker i de fleste situationer"> <!ENTITY torSettings.connect "Tilslut"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Lokale proxy indstillinger"> <!ENTITY torSettings.proxyQuestion "Behøver denne computer bruge en lokal proxy for at tilgå Internettet?">  <!ENTITY torSettings.proxyHelp "Hvis du ikke er sikker på svaret på dette spørgsmål, så kig på Internetindstillingerne i en anden browser for at se om den er konfigureret til at bruge en lokal proxy. "> <!ENTITY torSettings.enterProxy "Indtast proxy-indstillinger."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Tor bridge konfiguration"> <!ENTITY torSettings.bridgeQuestion "Blokerer eller censurerer din internetudbyder (ISP) forbindelser til Tor netværket?"> <!ENTITY torSettings.bridgeHelp "Hvis du er usikker på svaret til dette spørgsmål, vælg No.  Hvis du vælger Ja, vil du blive bedt om at konfigurere Tor Broer, der er ulistede relays, som gør det sværere at blokere forbindelser til Tor Netværket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruge det tildelte sæt broer eller du kan hente og indtaste et skræddersyet sæt broer."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 7beee39..66a1e54 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Tämä toimii useimmissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Paikallisen välityspalvelimen määritys"> <!ENTITY torSettings.proxyQuestion "Tarvitseeko tämän tietokoneen käyttää paikallista välityspalvelinta Internet-pääsyyn?">  <!ENTITY torSettings.proxyHelp "Jos et ole varma, kuinka vastata tähän kysymykseen, katso toisen selaimen Internet-asetuksista, onko se asetettu käyttämään paikallista välityspalvelinta."> <!ENTITY torSettings.enterProxy "Kirjoita välityspalvelinasetukset."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Tor-siltojen määritys"> <!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estääkö sinun operaattorisi (ISP) yhteydet Tor-verkkoon?"> <!ENTITY torSettings.bridgeHelp "Ellet ole varma kuinka vastata tähän kysymykseen, valitse Ei.  Jos valitset Kyllä, sinua pyydetään määrittämään Tor-sillat, jotka ovat listaamattomia välityspalvelimia, jotta yhteyksiä olisi vaikeampi estää Tor-verkkoon yhdistettäessä."> <!ENTITY torSettings.bridgeSettingsPrompt "Voit käyttää tarjottua siltajoukkoa tai voit hankkia ja kirjoittaa oman siltojen joukon."> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index 924d26d..0b41d35 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -16,12 +16,12 @@ internetskoj vezi ovog računala."> <!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> <!ENTITY torSettings.connect "Spajanje"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proxy-a"> <!ENTITY torSettings.proxyQuestion "Treba li ovo računalo koristiti lokalni proxy da pristupi Internetu?">  <!ENTITY torSettings.proxyHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, pogledajte Internet postavke u drugom pregledniku da vidite jeli postavljen da koristi lokalni proxy."> <!ENTITY torSettings.enterProxy "Unesite postavke proxyj-a."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Konfiguracija Tor mostova"> <!ENTITY torSettings.bridgeQuestion "Blokira li Vaš davetelj Internet usluge (ISP) ili drugačije cenzurira veze s Tor mrežom?"> <!ENTITY torSettings.bridgeHelp "Ako niste sigurni kako da odgovorite na ovo pitanje, odaberite Ne.  Ako odaberete Da, od Vas će se tražiti da konfigurirate Tor Mostove, koji su neizlistani releji koji otežavaju blokiranje povezivanja s Tor mrežom."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 4673dee..e410043 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -28,12 +28,12 @@  <!ENTITY torsettings.startingTor "Menunggu Tor untuk memulai..."> -<!ENTITY torsettings.restartTor "Muat ulang Tor"> +<!ENTITY torsettings.restartTor "Muat Ulang Tor"> <!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proxy lokal untuk mengakses internet"> -<!ENTITY torsettings.useProxy.type "Tipe Proxy:"> +<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proksi lokal untuk mengakses Internet"> +<!ENTITY torsettings.useProxy.type "Tipe Proksi:"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host"> <!ENTITY torsettings.useProxy.port "Port:"> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 02b229a..7c369cd 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Lokālā starpniekservera konfigurēšana"> <!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?">  <!ENTITY torSettings.proxyHelp "Ja neesat pārliecināts par atbildi uz šo jautājumu, apskatiet cita pārlūka interneta iestatījumus, lai redzētu vai pārlūks ir nokonfigurēts lokāla starpniekservera izmantošanai. "> <!ENTITY torSettings.enterProxy "Ievadiet starpnieka iestatījumus."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Tor tiltu konfigurēšana"> <!ENTITY torSettings.bridgeQuestion "Vai Jūsu interneta pakalpojumu sniedzējs (ISP) bloķē vai savādāk cenzē savienojumus ar tīklu Tor?"> <!ENTITY torSettings.bridgeHelp "Ja nezināt atbildi, izvēlieties No.  ja izvēlēsities Jā, Jums lūgs konfigurēt Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kuri apgrūtina savienojumu bloķēšanu ar tīklu Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Jūs varat izmantot piedāvāto tiltu kopumu vai varat ievadīt tiltu pielāgotu sarakstu. "> @@ -56,9 +56,9 @@ <!ENTITY torsettings.bridgeHelp1 "Ja nevarat izveidot savienojumu ar tīklu Tor, tad, iespējams, ka Jūsu interneta pakalpojumu sniedzējs (ISP) vai cita iestāde bloķē Tor.  Bieži, šo problemu var apiet izmantojot Tor tiltus jeb Tor Bridges, proti, neuzskaitītus retranslatorus, kurus grūtāk bloķēt."> <!ENTITY torsettings.bridgeHelp1B "Jūs varat izmantot iepriekš nokonfigurētas un piedāvātas tiltu adreses vai varat iegūt pielāgotu adrešu kopumu, sekojot vienai no trim metodēm:"> <!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli"> -<!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu lai apmeklētu https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu, lai apmeklētu https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "Sūtiet e-pastu uz bridges(a)torproject.org ar rindu 'get bridges' ziņojuma tekstā.  Taču, lai uzbrucējam būtu sarežģītāk uzzināt daudz tiltu adrešu, Jums jāsūta šis pieprasījums no kāda no šo e-pasta pakalpojumu sniedzēju e-pastiem (uzskatītiem vēlamās izvēles kārtībā):"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "Sūtiet e-pastu uz bridges(a)torproject.org ar rindu 'get bridges' ziņojuma tekstā.  Taču, lai uzbrucējam būtu sarežģītāk uzzināt daudz tiltu adrešu, Jums jāsūta šis pieprasījums no kāda no šo e-pasta pakalpojumu sniedzēju e-pastiem (uzskaitītiem vēlamās izvēles kārtībā):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com vai https://mail.yahoo.com"> <!ENTITY torsettings.bridgeHelp4Heading "Caur Palīdzības Centru"> <!ENTITY torsettings.bridgeHelp4 "Pēdējās instances palīdzība tiltu adrešu pieprasījumiem ir sūtīt pieklājīgu e-pasta adresi uz help(a)rt.torproject.org.  Lūdzu, ņemiet vērā, ka ikvienu pieprasījumu izskata cilvēks."> diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index 07d3d09..2de3c52 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -4,8 +4,8 @@ <!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> +<!ENTITY torSettings.yes "Ja"> +<!ENTITY torSettings.no "Nee"> <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> @@ -38,7 +38,7 @@ <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> <!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Wachtwoord:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> diff --git a/src/chrome/locale/nl-BE/progress.dtd b/src/chrome/locale/nl-BE/progress.dtd index ebd9cef..40774a0 100644 --- a/src/chrome/locale/nl-BE/progress.dtd +++ b/src/chrome/locale/nl-BE/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.openSettings "Open Instellingen"> +<!ENTITY torprogress.heading "Connecteren naar het Tor netwerk"> +<!ENTITY torprogress.pleaseWait "Gelieve te wachten tot we een connectie opzetten naar het Tor netwerk."> diff --git a/src/chrome/locale/nl-BE/torlauncher.properties b/src/chrome/locale/nl-BE/torlauncher.properties index 02be756..8d3941b 100644 --- a/src/chrome/locale/nl-BE/torlauncher.properties +++ b/src/chrome/locale/nl-BE/torlauncher.properties @@ -27,13 +27,13 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(aanbevolen) torlauncher.connect=Connect torlauncher.restart_tor=Restart Tor torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done +torlauncher.quit_win=Afsluiten +torlauncher.done=Klaar torlauncher.forAssistance=For assistance, contact %S @@ -46,7 +46,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network status torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=Connecteren naar het Tor netwerk torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 2bd99e7..dfceb1b 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Aceasta funcționează în cele mai multe situații."> <!ENTITY torSettings.connect "Conectare"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Configurare Proxy local"> <!ENTITY torSettings.proxyQuestion "Are nevoie acest computer să utilizeze un proxy local pentru accesarea internetului?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Dacă nu știi sigur cum să răspunzi la această întrebare, uită-te la setările de Internet într-un alt browser pentru a vedea dacă este configurat să folosească un proxy local."> <!ENTITY torSettings.enterProxy "Introduceţi setările pentru proxy ."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Configurare Punți Tor "> <!ENTITY torSettings.bridgeQuestion "Internet Service Providerul (ISP) dvs blochează sau cenzurează conexiunile către rețeaua Tor?"> <!ENTITY torSettings.bridgeHelp "Dacă nu sînteți sigur cum să răspundeți la această întrebare, alegeți Nu.  Dacă alegeți Da, vi se va cere să configurați punțile Tor, care sînt relayuri nelistate care fac mai dificilă blocarea conexiunilor la rețeaua Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Puteți folosi setul de punți oferit sau puteți obține și introduce un set particular de punți."> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index 02d1151..ff81a82 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -9,18 +9,18 @@ <!ENTITY torSettings.firstQuestion "Ktoré z nasledujúcich možností najlepšie opisuje Vašu situáciu?"> <!ENTITY torSettings.configurePrompt1 "Pripojenie tohto počítača k Internetu je cenzurované, filtrované alebo sprostredkovávané."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Potrebujem nastaviť premostenie alebo lokálne proxy nastavenia."> <!ENTITY torSettings.configure "Konfigurácia"> <!ENTITY torSettings.connectPrompt2 "Chcem sa pripojiť priamo do siete Tor."> <!ENTITY torSettings.connectPrompt3 "Toto bude vo väčšine prípadov fungovať."> <!ENTITY torSettings.connect "Pripojiť"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "Lokálne proxy nastavenie"> +<!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač používať lokálne proxy k prístupu na internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Ak si nie ste istý ako odpovedať na túto otázku, pozrite sa do internetových nastavení iného prehliadača aby ste pochopili či je nastavený tak aby používal lokálne proxy."> <!ENTITY torSettings.enterProxy "Vstúpiť do nastavení proxy."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Nastavenie Tor premostení"> <!ENTITY torSettings.bridgeQuestion "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?"> <!ENTITY torSettings.bridgeHelp "Ak ste si nie istý ako zodpovedať túto otázku, zvoľte Nie.  Ak zvolíte Áno, budete vyzvaný na konfiguráciu Mostov Toru, čo sú nezaradené relé značne sťažujúce blokovanie pripojení k Sieti Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Môžete použiť poskytnutú sadu mostov alebo získať a vložiť vlastnú sadu."> @@ -32,7 +32,7 @@ <!ENTITY torsettings.optional "Voliteľné"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje použivať lokálne proxy k prístupu na internet"> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> diff --git a/src/chrome/locale/sk/progress.dtd b/src/chrome/locale/sk/progress.dtd index 8df7047..81c3a1a 100644 --- a/src/chrome/locale/sk/progress.dtd +++ b/src/chrome/locale/sk/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor stav"> -<!ENTITY torprogress.openSettings "Otvor Nastavenia"> +<!ENTITY torprogress.dialog.title "Tor status"> +<!ENTITY torprogress.openSettings "Otvor nastavenia"> <!ENTITY torprogress.heading "Pripájanie do siete Tor"> <!ENTITY torprogress.pleaseWait "Prosíme počkajte kým nadviažeme spojenie so sieťou Toru."> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index a7c2c1e..7b0c4f2 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -15,10 +15,10 @@ <!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Konfiguracija lokalnog proksija"> <!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi kao pristup internetu?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a local proxy."> +<!ENTITY torSettings.proxyHelp "Ako niste sigurni kako da odgovorite na ovo pitanje, pogledajte internet podešavanja u drugom brauzeruda biste utvrdili da li je konfigurisan da koristi lokalni proksi."> <!ENTITY torSettings.enterProxy "Унесите proxy подешавања."> <!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> <!ENTITY torSettings.bridgeQuestion "Да ли Ваш интернет сервис провајдер (ИСП) блокира или на неки други начин цензурише повезивање на Тор мрежу?"> @@ -48,7 +48,7 @@ <!ENTITY torsettings.useBridges.default "Повежите се са понуђеним премошћивачима"> <!ENTITY torsettings.useBridges.type "Врста транспорта:"> <!ENTITY torsettings.useBridges.custom "Унесите жељене премошћиваче"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> +<!ENTITY torsettings.useBridges.label "Unesite jedan ili više releja mostova (u svakom redu po jedan)."> <!ENTITY torsettings.useBridges.placeholder "куцајте aдреса:порт"> <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 2428b47..ad2501d 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -2,63 +2,63 @@  -<!ENTITY torsettings.prompt "Tor ağa bağlanmadan önce, bu bilgisayarın İnternet bağlantısı hakkında bilgi vermeniz gerekir."> +<!ENTITY torsettings.prompt "Tor ağına bağlanmadan önce, bu bilgisayarın İnternet bağlantısı hakkında bilgi vermeniz gerekir."> <!ENTITY torSettings.yes "Evet"> <!ENTITY torSettings.no "Hayır"> <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> -<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü veya vekil sunucu arkasında."> -<!ENTITY torSettings.configurePrompt2 "Köprü ve yerel vekil sunucu ayarlarını yapılandırmam gerekiyor."> -<!ENTITY torSettings.configure "Yapılandır"> -<!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> -<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> +<!ENTITY torSettings.configurePrompt1 "Bu bilgisayarın İnternet bağlantısı sansürlü ya da vekil sunucu arkasında."> +<!ENTITY torSettings.configurePrompt2 "Köprü ve yerel vekil sunucu ayarlarını yapmam gerekiyor."> +<!ENTITY torSettings.configure "Ayarla"> +<!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum."> +<!ENTITY torSettings.connectPrompt3 "Çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> -<!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu Yapılandırması"> -<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternet'e erişebilmesi için yerel bir vekil sunucu kullanması gerekiyor mu?"> +<!ENTITY torSettings.proxyPageTitle "Yerel Vekil Sunucu Ayarları"> +<!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternet erişimi için yerel bir vekil sunucu kullanması gerekiyor mu?">  -<!ENTITY torSettings.proxyHelp "Bu soruyu nasıl yanıtlayacağınızı bilmiyorsanız, başka bir tarayıcıda İnternet seçeneklerine bakara yerel bir vekil sunucu kullanıp kullanmadığını görün."> -<!ENTITY torSettings.enterProxy "Vekil ayarlarını girin."> -<!ENTITY torSettings.bridgePageTitle "Tor Köprü Yapılandırması"> -<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına bağlantıları engelliyor veya sansürlüyor mu?"> -<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> -<!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz."> +<!ENTITY torSettings.proxyHelp "Bu soruyu nasıl yanıtlayacağınızı bilmiyorsanız, başka bir tarayıcıda İnternet ayarlarına bakarak yerel bir vekil sunucu kullanılıp kullanılmadığını görün."> +<!ENTITY torSettings.enterProxy "Vekil sunucu ayarlarını yazın."> +<!ENTITY torSettings.bridgePageTitle "Tor Köprüleri Ayarları"> +<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına bağlantıları engelliyor ya da sansürlüyor mu?"> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır seçin.  Evet seçerseniz, Tor Ağı bağlantılarının engellenmesini daha zor hale getiren, listelenmeyen aktarıcılar olan Tor Köprülerini ayarlamanız istenir."> +<!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprüler kümesini kullanabilir ya da özel bir köprü kümesi edinip yazabilirsiniz.">  -<!ENTITY torsettings.startingTor "Tor'un başlaması bekleniyor..."> -<!ENTITY torsettings.restartTor "Tor'u Yeniden Başlat"> +<!ENTITY torsettings.startingTor "Tor yazılımının başlaması bekleniyor..."> +<!ENTITY torsettings.restartTor "Tor Yazılımını Yeniden Başlat"> <!ENTITY torsettings.optional "İsteğe Bağlı"> -<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayar İnternet'e erişmek için yerel bir vekil sunucu gerektiriyor."> -<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> +<!ENTITY torsettings.useProxy.checkbox "Bu bilgisayar İnternet erişimi için yerel bir vekil sunucu kullanıyor."> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Tipi:"> <!ENTITY torsettings.useProxy.address "Adres:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP adresi veya sunucu adı"> -<!ENTITY torsettings.useProxy.port "Bağl. Nok.:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı"> +<!ENTITY torsettings.useProxy.port "Kapı:"> <!ENTITY torsettings.useProxy.username "Kullanıcı adı:"> <!ENTITY torsettings.useProxy.password "Parola:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Bu bilgisayar, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarı ile bağlanıyor"> -<!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Bağlantı Noktaları:"> +<!ENTITY torsettings.firewall.checkbox "Bu bilgisayar, yalnız belirli kapılara bağlanma izin veren bir güvenlik duvarı kullanıyor "> +<!ENTITY torsettings.firewall.allowedPorts "İzin Verilen Kapılar:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (İSS) Tor Ağı ile bağlantılarımı engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.type "Aktarım türü:"> -<!ENTITY torsettings.useBridges.custom "Özel köprüler girin"> -<!ENTITY torsettings.useBridges.label "Bir veya daha fazla köprü aynası girin (her satıra bir tane)."> -<!ENTITY torsettings.useBridges.placeholder "adresi:port şeklinde yazın"> +<!ENTITY torsettings.useBridges.type "Aktarım tipi:"> +<!ENTITY torsettings.useBridges.custom "Özel köprüler yazın"> +<!ENTITY torsettings.useBridges.label "Bir ya da bir kaç köprü aktarıcısı yazın (her satıra bir tane)."> +<!ENTITY torsettings.useBridges.placeholder "adres:kapı şeklinde yazın"> <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> -<!ENTITY torsettings.bridgeHelpTitle "Köprü Ayna Yardımı"> -<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.  Çoğunlukla bu problemi, engellenmesi daha zor listelenmeyen aynalar olan Tor Köprülerini kullanarak çözebilirsiniz."> -<!ENTITY torsettings.bridgeHelp1B "Önceden yapılandırılan sağlanan köprü adresleri setini kullanabilirsiniz veya bu üç yöntemden birini kullanarak adres kümesinden özel bir set sağlayabilirsiniz:"> -<!ENTITY torsettings.bridgeHelp2Heading "Web aracılığıyla."> -<!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek için web tarayıcısı kullanın."> -<!ENTITY torsettings.bridgeHelp3Heading "E-posta Otomatik Cevaplandırıcı Aracılığıyla"> -<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.  Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu e-postayı aşağıdaki e-posta sağlayıcılarından yollamanız gerekmektedir (tercih sırasına göre listelenmiştir):"> -<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com veya https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Help Desk aracılığıyla."> -<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.  Birisinin bu talebi cevaplayacağını unutmayın."> +<!ENTITY torsettings.bridgeHelpTitle "Köprü Aktarıcı Yardımı"> +<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor yazılımını engelliyor olabilir.  Bu sorunu çoğunlukla, engellenmesi daha zor olan listelenmeyen aktarıcılar, Tor Köprülerini kullanarak çözebilirsiniz."> +<!ENTITY torsettings.bridgeHelp1B "Önceden ayarlanmış ve sunulmuş köprü adresleri kümesini kullanabilir ya da şu üç yöntemden birini kullanarak özel bir adres kümesi edinebilirsiniz:"> +<!ENTITY torsettings.bridgeHelp2Heading "Web yoluyla"> +<!ENTITY torsettings.bridgeHelp2 "Web tarayıcınız ile https://bridges.torproject.org sitesine bakın"> +<!ENTITY torsettings.bridgeHelp3Heading "Otomatik e-posta yanıtı yoluyla"> +<!ENTITY torsettings.bridgeHelp3.emailDesc "bridges(a)torproject.org adresine, ileti içeriğine yalnız 'get bridges' yazarak bir e-posta gönderin.  Bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu e-postayı aşağıdaki e-posta sağlayıcılarının birinden yollmalısınız (yeğlenme sırasına göre listelenmiştir):"> +<!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com ya da https://mail.yahoo.com"> +<!ENTITY torsettings.bridgeHelp4Heading "Yardım masası yoluyla"> +<!ENTITY torsettings.bridgeHelp4 "Son yol olarak, köprü adreslerini help(a)rt.torproject.org adresine göndereceğiniz nazik bir e-posta ile isteyebilirsiniz.  Her isteği bir kişinin yanıtlayacağını unutmayın."> diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd index 05fa310..353bbbe 100644 --- a/src/chrome/locale/tr/progress.dtd +++ b/src/chrome/locale/tr/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Durumu"> <!ENTITY torprogress.openSettings "Ayarları Aç"> -<!ENTITY torprogress.heading "Tor ağına bağlanıyor"> -<!ENTITY torprogress.pleaseWait "Tor ağı ile bağlantı kurana kadar lütfen bekleyin."> +<!ENTITY torprogress.heading "Tor ağına bağlanılıyor"> +<!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulana kadar bekleyin."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index f4ca504..3b88714 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -3,59 +3,59 @@ torlauncher.error_title=Tor Başlatıcı -torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu; Tor içerisinde veya sisteminizdeki farklı bir programda bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Tor'u yeniden başlatıncaya kadar Tor Tarayıcısı hiçbir web sitesine erişemeyecek. Eğer sorun devam ederse lütfen Tor Günlüğünüzün bir kopyasını destek takımına gönderin. -torlauncher.tor_exited2=Tor'u yeniden başlatmak tarayıcı sekmelerinizi kapatmayacak. -torlauncher.tor_controlconn_failed=Tor yönetim bağlantı noktasına bağlanılamadı. +torlauncher.tor_exited=Tor, beklenmedik şekilde sonlandı. Bu durum Tor içinde ya da sisteminizdeki başka bir yazılımda bulunan bir hatadan ya da sorunlu bir donanımdan kaynaklanmış olabilir. Yeniden başlatılana kadar Tor Browser hiçbir web sitesine erişemeyecek. Sorun devam ederse lütfen Tor Günlüğünün bir kopyasını destek takımına gönderin. +torlauncher.tor_exited2=Tor yeniden başlatıldığında tarayıcı sekmelerinizi kapatılmayacak. +torlauncher.tor_controlconn_failed=Tor denetim kapısına bağlanılamadı. torlauncher.tor_failed_to_start=Tor başlatılamadı. -torlauncher.tor_control_failed=Tor'u kontrol altına alma başarısız -torlauncher.tor_bootstrap_failed=Tor'un ağ bağlantısı kurulumu başarısız oldu. +torlauncher.tor_control_failed=Tor denetimi alınamadı. +torlauncher.tor_bootstrap_failed=Tor ağıyla bağlantı kurulamadı. torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S). -torlauncher.unable_to_start_tor=Tor başlatılamıyor.\n\n%S -torlauncher.tor_missing=Çalıştırılabilir Tor dosyası bulunamadı. -torlauncher.torrc_missing=torrc dosyası kayıp. +torlauncher.unable_to_start_tor=Tor başlatılamadı.\n\n%S +torlauncher.tor_missing=Çalıştırılabilecek Tor dosyası bulunamadı. +torlauncher.torrc_missing=torrc dosyası bulunamadı. torlauncher.datadir_missing=Tor veri klasörü bulunamadı. -torlauncher.password_hash_missing=Hash'lenmiş şifreye ulaşılamadı. +torlauncher.password_hash_missing=Karılmış parola alınamadı. -torlauncher.failed_to_get_settings=Tor ayarlarına ulaşılamıyor.\n\n%S -torlauncher.failed_to_save_settings=Tor ayarları kaydedilemiyor.\n\n%S +torlauncher.failed_to_get_settings=Tor ayarları alınamadı.\n\n%S +torlauncher.failed_to_save_settings=Tor ayarları kaydedilemedi.\n\n%S torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. -torlauncher.error_proxy_addr_missing=İnternete bağlanırken vekil sunucusu kullanmak için IP adresi veya sunucu ve bağlantı noktası numarası girmeniz gerekiyor. -torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. -torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. -torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. -torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı değiştirin. +torlauncher.error_proxy_addr_missing=İnternete bir vekil sunucu üzerinden bağlanmak için bir IP adresi ya da sunucu adı ile kapı numarasının yazılması gereklidir. +torlauncher.error_proxy_type_missing=Vekil sunucu tipini seçmelisiniz. +torlauncher.error_bridges_missing=Bir ya da bir kaç köprü belirtmelisiniz. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım tipi seçmelisiniz. +torlauncher.error_bridge_bad_default_type=Sağlanan köprüler %S aktarım tipi için kullanılamıyor. Lütfen ayarlarınızı değiştirin. -torlauncher.recommended_bridge=(önerilen) +torlauncher.recommended_bridge=(önerilir) torlauncher.connect=Bağlan -torlauncher.restart_tor=Tor'u Yeniden Başlat +torlauncher.restart_tor=Tor Yazılımını Yeniden Başlat torlauncher.quit=Çık torlauncher.quit_win=Çıkış torlauncher.done=Tamamlandı -torlauncher.forAssistance=Yardım için %S ile bağlantıya geçin. +torlauncher.forAssistance=Yardım için %S ile görüşün -torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük mesajları bir metin düzenleyici veya bir e-posta iletisine kopyalanmaya hazır. +torlauncher.copiedNLogMessages=Kopyalama tamamlandı. %S Tor günlük iletisi bir metin düzenleyici ya da e-posta iletisine kopyalanmaya hazır. -torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor +torlauncher.bootstrapStatus.conn_dir=Bir aktarıcı dizinine bağlanılıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor torlauncher.bootstrapStatus.requesting_status=Ağ durumu alınıyor torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor -torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikaları yükleniyor -torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor -torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor -torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanıyor -torlauncher.bootstrapStatus.handshake_or=Tor ağına bağlantı sağlanıyor -torlauncher.bootstrapStatus.done=Tor ağına bağlandı! +torlauncher.bootstrapStatus.loading_keys=Otorite sertifikaları yükleniyor +torlauncher.bootstrapStatus.requesting_descriptors=Aktarıcı bilgisi isteniyor +torlauncher.bootstrapStatus.loading_descriptors=Aktarıcı bilgisi yükleniyor +torlauncher.bootstrapStatus.conn_or=Tor ağına bağlanılıyor +torlauncher.bootstrapStatus.handshake_or=Bir Tor devresi kuruluyor +torlauncher.bootstrapStatus.done=Tor ağına bağlanıldı! torlauncher.bootstrapWarning.done=tamam torlauncher.bootstrapWarning.connectrefused=bağlantı geri çevrildi torlauncher.bootstrapWarning.misc=çeşitli -torlauncher.bootstrapWarning.resourcelimit=yetersiz kaynak -torlauncher.bootstrapWarning.identity=kimlik uyumsuz -torlauncher.bootstrapWarning.timeout=zaman aşımı -torlauncher.bootstrapWarning.noroute=yönlendirilecek sunucu yok +torlauncher.bootstrapWarning.resourcelimit=kaynaklar yetersiz +torlauncher.bootstrapWarning.identity=kimlik uyuşmazlığı +torlauncher.bootstrapWarning.timeout=bağlantı zaman aşımı +torlauncher.bootstrapWarning.noroute=sunucu yöneltmesi yok torlauncher.bootstrapWarning.ioerror=okuma/yazma hatası -torlauncher.bootstrapWarning.pt_missing=takılabilir taşıma kayıp +torlauncher.bootstrapWarning.pt_missing=takılabilir aktarım bulunamadı diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index 8b5a264..1886481 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -15,12 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "Це має працювати у більшості ситуацій."> <!ENTITY torSettings.connect "З'єднатися"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> +<!ENTITY torSettings.proxyPageTitle "Локальна конфігурація проксі-сервера"> <!ENTITY torSettings.proxyQuestion "Чи потрібно цьому комп'ютеру використовувати локальний проксі для доступу в Інтернет?">  <!ENTITY torSettings.proxyHelp "Якщо ви не знаєте, як відповісти на це питання, перевірте налаштування Інтернету в іншому браузері, щоб побачити чи він налаштований на використання локального проксі."> <!ENTITY torSettings.enterProxy "Задати параметри проксі"> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> +<!ENTITY torSettings.bridgePageTitle "Конфігурації Tor-мостів"> <!ENTITY torSettings.bridgeQuestion "Ваш Інтернет-провайдер (ISP) блокує чи яким-небудь чином цензурує підключення до Tor мережі?"> <!ENTITY torSettings.bridgeHelp "Якщо Ви не знаєте, як відповісти на це питання, виберіть Ні.  Якщо Ви виберете Так, Вам буде запропоновано налаштувати мости Tor, що є приватними трансляторами, які роблять більш важким блокування з'єднань з Tor мережі."> <!ENTITY torSettings.bridgeSettingsPrompt "Ви можете використати визначений перелік мостів або можете отримати і ввести набір мостів вручну.">

1 0

[tor-launcher/master] Bump version to 0.2.7.7
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit 5db9bfd3fe0a9855bede7fa61d4bd65f236ad879 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 19:45:14 2015 +0000 Bump version to 0.2.7.7 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 0b8fc34..a7524b7 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.7.6</em:version> + <em:version>0.2.7.7</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[torbutton/master] Bug 16730: Reset NoScript whitelist on upgrade
by gk＠torproject.org 07 Aug '15

07 Aug '15

commit 59ef74948aeea8d73f8833ab9e918cd1b70b6a32 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 7 15:09:42 2015 +0000 Bug 16730: Reset NoScript whitelist on upgrade This fixes 16722 as well and resets the toolbar UI to kill "Share this page", but that still requires another restart :/. This is basically Mike's idea and code. --- src/chrome/content/torbutton.js | 38 +++++++++++++++++++++++++++++++ src/defaults/preferences/preferences.js | 3 +++ 2 files changed, 41 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 1d81960..28da420 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2864,6 +2864,41 @@ function torbutton_restore_cookies(tor_enabled) } } +// Bug 1506 P1: This function just cleans up prefs that got set badly in previous releases +function torbutton_fixup_old_prefs() +{ + if(m_tb_prefs.getIntPref('extensions.torbutton.pref_fixup_version') < 1) { + // TBB 5.0a3 had bad Firefox code that silently flipped this pref on us + if (m_tb_prefs.prefHasUserValue("browser.newtabpage.enhanced")) { + m_tb_prefs.clearUserPref("browser.newtabpage.enhanced"); + // TBB 5.0a3 users had all the necessary data cached in + // directoryLinks.json. This meant that resetting the pref above + // alone was not sufficient as the tiles features uses the cache + // even if the pref indicates that feature should be disabled. + // We flip the preference below as this forces a refetching which + // effectively results in an empty JSON file due to our spoofed + // URLs. + let matchOS = m_tb_prefs.getBoolPref("intl.locale.matchOS"); + m_tb_prefs.setBoolPref("intl.locale.matchOS", !matchOS); + m_tb_prefs.setBoolPref("intl.locale.matchOS", matchOS); + } + + // Prior to TBB 5.0, NoScript was allowed to update its whitelist. This caused + // odd things to appear in people's whitelists. + if (m_tb_prefs.prefHasUserValue("capability.policy.maonoscript.sites")) { + m_tb_prefs.clearUserPref("capability.policy.maonoscript.sites"); + } + + // For some reason, the Share This Page button also survived the + // TBB 5.0a4 update's attempt to remove it. + if (m_tb_prefs.prefHasUserValue("browser.uiCustomization.state")) { + m_tb_prefs.clearUserPref("browser.uiCustomization.state"); + } + + m_tb_prefs.setIntPref('extensions.torbutton.pref_fixup_version', 1); + } +} + // ---------------------- Event handlers ----------------- // Bug 1506 P1/P3: This removes any platform-specific junk @@ -2971,6 +3006,9 @@ function torbutton_do_startup() prompts.alert(null, title, warning); } + // For general pref fixups to handle pref damage in older versions + torbutton_fixup_old_prefs(); + m_tb_prefs.setBoolPref("extensions.torbutton.startup", false); } } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 6b4ec0c..ce66d0e 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -225,3 +225,6 @@ pref("spellchecker.dictionary", "chrome://torbutton/locale/browser.properties"); pref("extensions.torbutton.window.maxHeight", 1000); pref("extensions.torbutton.window.maxWidth", 1000); + +// This pref specifies an ad-hoc "version" for various pref update hacks we need to do +pref("extensions.torbutton.pref_fixup_version", 0);

1 0

[tor-browser-bundle/master] Bug 16730: Prevent NoScript from updating the default whitelist
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 918455b0256f15b81c838fd1dd3600e87fecec15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 6 15:09:57 2015 -0700 Bug 16730: Prevent NoScript from updating the default whitelist --- .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + .../Data/Browser/profile.default/preferences/extension-overrides.js | 1 + 3 files changed, 3 insertions(+) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js index 7a95619..26b019c 100644 --- a/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -45,6 +45,7 @@ pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); +pref("noscript.allowWhitelistUpdates", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js index 7a95619..26b019c 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -45,6 +45,7 @@ pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); +pref("noscript.allowWhitelistUpdates", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false); diff --git a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js index 976d71c..d92bd3b 100644 --- a/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -45,6 +45,7 @@ pref("noscript.subscription.lastCheck", -142148139); pref("noscript.temp", ""); pref("noscript.untrusted", ""); pref("noscript.forbidMedia", false); +pref("noscript.allowWhitelistUpdates", false); // Now handled by plugins.click_to_play pref("noscript.forbidFlash", false); pref("noscript.forbidSilverlight", false);

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit c1273008b1e00a60ce51cec4aa68ed83363c9a20 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:40:47 2015 -0400 fixup! Bug 15646: Prevent keyboard layout fingerprinting in KeyboardEvent Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- dom/events/KeyboardEvent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp index 76e6e39..6a68f96 100644 --- a/dom/events/KeyboardEvent.cpp +++ b/dom/events/KeyboardEvent.cpp @@ -14,7 +14,7 @@ namespace dom { static bool ResistFingerprinting() { return nsContentUtils::ResistFingerprinting() && - !nsContentUtils::IsCallerChrome(); + !nsContentUtils::ThreadsafeIsCallerChrome(); } KeyboardEvent::KeyboardEvent(EventTarget* aOwner,

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 6253: Add canvas image extraction prompt.
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit cce64292e7b2633016b2505da8a445b7af633fd5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:36:30 2015 -0400 fixup! Bug 6253: Add canvas image extraction prompt. Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- dom/canvas/CanvasUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/canvas/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp index f1978ff..9883a52 100644 --- a/dom/canvas/CanvasUtils.cpp +++ b/dom/canvas/CanvasUtils.cpp @@ -55,7 +55,7 @@ bool IsImageExtractionAllowed(nsIDocument *aDocument, JSContext *aCx) return true; // Don't show canvas prompt for chrome scripts (e.g. Page Inspector) - if (nsContentUtils::IsCallerChrome()) + if (nsContentUtils::ThreadsafeIsCallerChrome()) return true; JS::AutoFilename scriptFile;

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] Merge remote-tracking branch 'brade/bug16715-01' into tor-browser-38.1.0esr-5.0-1
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 2cdcdb2535957a79a2e6577188e25c9f783d3634 Merge: bfdfccc c127300 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Aug 6 14:37:02 2015 -0700 Merge remote-tracking branch 'brade/bug16715-01' into tor-browser-38.1.0esr-5.0-1 dom/canvas/CanvasUtils.cpp | 2 +- dom/events/Event.cpp | 2 +- dom/events/KeyboardEvent.cpp | 2 +- layout/style/nsComputedDOMStyle.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 13016: Hide CSS -moz-osx-font-smoothing values.
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 85bfd5df3fa1dff272e5f527d39e1b69cb3b746a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:33:59 2015 -0400 fixup! Bug 13016: Hide CSS -moz-osx-font-smoothing values. Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- layout/style/nsComputedDOMStyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 257a1af..a8c30cc 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -1437,7 +1437,7 @@ nsComputedDOMStyle::DoGetFontSizeAdjust() CSSValue* nsComputedDOMStyle::DoGetOSXFontSmoothing() { - if (!nsContentUtils::IsCallerChrome()) + if (!nsContentUtils::ThreadsafeIsCallerChrome()) return nullptr; nsROCSSPrimitiveValue* val = new nsROCSSPrimitiveValue;

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 4755: Return client window coordinates for mouse event screenX/Y
by mikeperry＠torproject.org 06 Aug '15

06 Aug '15

commit 5282caeb91c9458ddb26edc2684a8b76ee53eb42 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 10:29:19 2015 -0400 fixup! Bug 4755: Return client window coordinates for mouse event screenX/Y Use ThreadsafeIsCallerChrome() instead of IsCallerChrome(). --- dom/events/Event.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp index 066fc0b..c92d2c9 100644 --- a/dom/events/Event.cpp +++ b/dom/events/Event.cpp @@ -882,7 +882,7 @@ Event::GetScreenCoords(nsPresContext* aPresContext, WidgetEvent* aEvent, LayoutDeviceIntPoint aPoint) { - if (!nsContentUtils::IsCallerChrome()) { + if (!nsContentUtils::ThreadsafeIsCallerChrome()) { // For non-chrome callers, return client coordinates instead. // For some events, the result will be zero; specifically, for dragend // events (there is no widget associated with dragend events, which

1 0

[torbutton/master] Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click
by gk＠torproject.org 06 Aug '15

06 Aug '15

commit 97796d37738679b232a226f039e9b407b1a47c98 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 15:02:19 2015 -0400 Bug 16731: TBB 5.0 a3/a4 fails to download a file on right click Account for an nsIExternalHelperAppService.idl interface change (the parameters to the doContent() method were changed between ESR31 and ESR38). See Mozilla bug #903022. --- src/components/external-app-blocker.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index cabd72b..b349ab4 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -191,7 +191,8 @@ ExternalWrapper.prototype = return result; }, - doContent: function(aMimeContentType, aRequest, aWindowContext, aForceSave) { + doContent: function(aMimeContentType, aRequest, aContentContext, + aForceSave, aWindowContext) { if(this.blockApp()) { var check = {value: false}; var result = this._confirmLaunch(aRequest.name, check); @@ -201,7 +202,8 @@ ExternalWrapper.prototype = } } - return this._external().doContent(aMimeContentType, aRequest, aWindowContext, aForceSave); + return this._external().doContent(aMimeContentType, aRequest, + aContentContext, aForceSave, aWindowContext); }, observe: function(subject, topic, data) {

1 0

[tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Bug 13670.1: Isolate favicon requests by first party.
by gk＠torproject.org 06 Aug '15

06 Aug '15

commit bfdfcccae99d1af38b3320eb7409377bd0ebc154 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 5 11:16:12 2015 -0400 fixup! Bug 13670.1: Isolate favicon requests by first party. Fix debug build error: Inside nsContentUtils::LoadImage(), remove the NS_PRECONDITION() call that references the aLoadingDocument parameter (which had been removed). --- dom/base/nsContentUtils.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 0ce2095..6b7461a 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -2997,7 +2997,6 @@ nsContentUtils::LoadImage(nsIURI* aURI, nsINode* aLoadingNode, uint32_t aContentPolicyType) { NS_PRECONDITION(aURI, "Must have a URI"); - NS_PRECONDITION(aLoadingDocument, "Must have a document"); NS_PRECONDITION(aLoadingPrincipal, "Must have a principal"); NS_PRECONDITION(aRequest, "Null out param");

1 0