September 2014 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-24.8.0esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 86e814b7e3693a7e3a5f3339683208d9e7fcabeb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 29 15:34:39 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. (missing pref setting for "Bug #2949: Make Intermediate Cert Store memory-only") --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index c557d98..8635015 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -18,6 +18,7 @@ pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1); +pref("security.nocertdb", true); // Disk activity: TBB Directory Isolation pref("browser.download.useDownloadDir", false);

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13049: updater fails (self.update is undefined).
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 9906e7e26e1dcbf313121dbf46e5a22aa185fd05 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 3 13:56:57 2014 -0400 Bug 13049: updater fails (self.update is undefined). Replace "self.update" with "this.update" in two add-on compatibility check functions. Using self.update (which is undefined) caused the updater to silently fail if one or more installed add-ons were marked in their install.rdf file as not compatible with the new platformVersion. We also replaced "TBB" with "Tor Browser" in the about box text. --- browser/base/content/aboutDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js index c72c828..431d520 100644 --- a/browser/base/content/aboutDialog.js +++ b/browser/base/content/aboutDialog.js @@ -49,7 +49,7 @@ function init(aEvent) #ifdef TOR_BROWSER_VERSION let versionElem = document.getElementById("version"); if (versionElem) - versionElem.textContent += " (TBB " + TOR_BROWSER_VERSION + ")"; + versionElem.textContent += " (Tor Browser " + TOR_BROWSER_VERSION + ")"; #endif #ifdef MOZ_UPDATER @@ -444,9 +444,9 @@ appUpdater.prototype = checkAddonsForUpdates: function() { this.addons.forEach(function(aAddon) { #ifdef TOR_BROWSER_UPDATE - let compatVersion = self.update.platformVersion; + let compatVersion = this.update.platformVersion; #else - let compatVersion = self.update.appVersion; + let compatVersion = this.update.appVersion; #endif aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED, compatVersion, @@ -471,9 +471,9 @@ appUpdater.prototype = */ onUpdateAvailable: function(aAddon, aInstall) { #ifdef TOR_BROWSER_UPDATE - let compatVersion = self.update.platformVersion; + let compatVersion = this.update.platformVersion; #else - let compatVersion = self.update.appVersion; + let compatVersion = this.update.appVersion; #endif if (!Services.blocklist.isAddonBlocklisted(aAddon.id, aInstall.version, compatVersion,

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13047: Updater should not send Kernel/GTK version
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit e4eca4759ead07562e4f6526b1ce79fe056fd03a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 18 13:51:43 2014 -0400 Bug 13047: Updater should not send Kernel/GTK version Removed the %OS_VERSION% component from the update URL and replaced the /update/ component of the URL with /update_2/. Added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Older versions of TB will ignore this (unknown to them) attribiute. --- browser/app/profile/firefox.js | 2 +- toolkit/mozapps/update/nsUpdateService.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 3e3a77c..620a7a9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -152,7 +152,7 @@ pref("app.update.silent", false); pref("app.update.staging.enabled", true); // Update service URL: -pref("app.update.url", "https://www.torproject.org/dist/torbrowser/update/%CHANNEL%/%BUILD_TARGET%/…"); +pref("app.update.url", "https://www.torproject.org/dist/torbrowser/update_2/%CHANNEL%/%BUILD_TARGET…"); // app.update.url.manual is in branding section // app.update.url.details is in branding section diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js index eb4a74a..fbf99a7 100644 --- a/toolkit/mozapps/update/nsUpdateService.js +++ b/toolkit/mozapps/update/nsUpdateService.js @@ -1598,7 +1598,17 @@ function Update(update) { this._patches.push(patch); } - if (this._patches.length == 0 && !update.hasAttribute("unsupported")) + if (update.hasAttribute("unsupported")) + this.unsupported = ("true" == update.getAttribute("unsupported")); + else if (update.hasAttribute("minSupportedOSVersion")) { + let minOSVersion = update.getAttribute("minSupportedOSVersion"); + try { + let osVersion = Services.sysinfo.getProperty("version"); + this.unsupported = (Services.vc.compare(osVersion, minOSVersion) < 0); + } catch (e) {} + } + + if (this._patches.length == 0 && !this.unsupported) throw Cr.NS_ERROR_ILLEGAL_VALUE; // Fallback to the behavior prior to bug 530872 if the update does not have an @@ -1643,15 +1653,13 @@ function Update(update) { if(!isNaN(attr.value)) this.promptWaitTime = parseInt(attr.value); } - else if (attr.name == "unsupported") - this.unsupported = attr.value == "true"; else if (attr.name == "version") { // Prevent version from replacing displayVersion if displayVersion is // present in the update xml. if (!this.displayVersion) this.displayVersion = attr.value; } - else { + else if (attr.name != "unsupported") { this[attr.name] = attr.value; switch (attr.name) {

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13049' into tor-browser-24.8.0esr-4.x-1
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 4424293819b0ae7b184b5e0703e2b4511d1b24f4 Merge: b269bb0 9906e7e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:12:12 2014 -0700 Merge remote-tracking branch 'brade/bug13049' into tor-browser-24.8.0esr-4.x-1 browser/base/content/aboutDialog.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Bug 13091: Use "Tor Browser" everywhere (space included)
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit b269bb036db77aef26bef86d947006c27992b683 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 9 11:52:08 2014 -0400 Bug 13091: Use "Tor Browser" everywhere (space included) Changed MOZ_APP_DISPLAYNAME and brandShortName from "TorBrowser" to "Tor Browser". --- .mozconfig | 2 +- .mozconfig-asan | 2 +- .mozconfig-mac | 2 +- .mozconfig-mingw | 2 +- browser/branding/official/configure.sh | 2 +- browser/branding/official/locales/en-US/brand.dtd | 2 +- browser/branding/official/locales/en-US/brand.properties | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.mozconfig b/.mozconfig index 97e0349..f0c5510 100755 --- a/.mozconfig +++ b/.mozconfig @@ -1,7 +1,7 @@ . $topsrcdir/browser/config/mozconfig mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-asan b/.mozconfig-asan index 32e3096..ffbde72 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -10,7 +10,7 @@ export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined -st export LDFLAGS="-fsanitize=address -fsanitize=undefined" mk_add_option sMOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-mac b/.mozconfig-mac index 7f28096..01ed601 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -25,7 +25,7 @@ LD=$ROOTDIR/x86_64-apple-darwin10-ld STRIP=$ROOTDIR/x86_64-apple-darwin10-strip mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 9c8695d..f3fc080 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -5,7 +5,7 @@ ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw -mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh index 33102b0..2b1b638 100644 --- a/browser/branding/official/configure.sh +++ b/browser/branding/official/configure.sh @@ -2,5 +2,5 @@ # 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/. -MOZ_APP_DISPLAYNAME=TorBrowser +MOZ_APP_DISPLAYNAME="Tor Browser" MOZ_UA_BUILDID=20100101 diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd index 76e405d..59f665e 100644 --- a/browser/branding/official/locales/en-US/brand.dtd +++ b/browser/branding/official/locales/en-US/brand.dtd @@ -2,7 +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/. --> -<!ENTITY brandShortName "TorBrowser"> +<!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation."> diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties index 9ae168e..f63def3 100644 --- a/browser/branding/official/locales/en-US/brand.properties +++ b/browser/branding/official/locales/en-US/brand.properties @@ -2,7 +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/. -brandShortName=TorBrowser +brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project

1 0

[tor-browser/tor-browser-24.8.0esr-4.x-1] Merge remote-tracking branch 'brade/bug13047-03' into tor-browser-24.8.0esr-4.x-1
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit b0cd4e20527b9c1fc603ab1b18a5f36ffc3f726f Merge: 4424293 e4eca47 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:19:28 2014 -0700 Merge remote-tracking branch 'brade/bug13047-03' into tor-browser-24.8.0esr-4.x-1 browser/app/profile/firefox.js | 2 +- toolkit/mozapps/update/nsUpdateService.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-)

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 23 Sep '14

23 Sep '14

commit 67af19b59d703d5b23f6213025a301fa6ec8b795 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 23 03:15:05 2014 +0000 Update translations for bridgedb_completed --- ja/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 98e9e77..72f23c6 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-09-23 02:45+0000\n" +"PO-Revision-Date: 2014-09-23 02:50+0000\n" "Last-Translator: talex1 <talex(a)privatdemail.net>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 23 Sep '14

23 Sep '14

commit ea24eed5f6fc6a6a36e17fafeb1e141be6ca644a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 23 03:15:03 2014 +0000 Update translations for bridgedb --- ja/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index bb2af4a..72f23c6 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-07-26 02:11+0000\n" -"PO-Revision-Date: 2014-09-23 02:43+0000\n" +"PO-Revision-Date: 2014-09-23 02:50+0000\n" "Last-Translator: talex1 <talex(a)privatdemail.net>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

[torbutton/master] Bump version and update changelog for 1.6.12.2.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit 0b02de380a388e8abe1be0a55631414c04dd71eb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 20:04:04 2014 -0700 Bump version and update changelog for 1.6.12.2. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0943687..f5d32e9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.12.2 + 22 Sep 2014 + * Bug 13091: Use "Tor Browser" everywhere + 1.6.12.1 1 Sep 2014 * Bug 12684: Add `canvas.notNow` UI strings to torbutton.properties file. diff --git a/src/install.rdf b/src/install.rdf index de66e4e..7e2f4fc 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.6.12.1</em:version> + <em:version>1.6.12.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

[torbutton/master] Merge remote-tracking branch 'brade/bug13091'
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

1 0