- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update subkeys for Mike Perry.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 123bd9783692471258258042770c1fe58126d3d7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:44:13 2014 -0700 Update subkeys for Mike Perry. --- gitian/gpg/mikeperry.gpg | Bin 7813 -> 15716 bytes gitian/gpg/torbutton.gpg | Bin 7813 -> 15716 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/mikeperry.gpg b/gitian/gpg/mikeperry.gpg index ab4acc0..7f14ee3 100644 Binary files a/gitian/gpg/mikeperry.gpg and b/gitian/gpg/mikeperry.gpg differ diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index ab4acc0..7f14ee3 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-3.6] Update changelog and versions for 3.6.6.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 7edebbe2c3f5ece67e4395f3209c866179c904ec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:30:21 2014 -0700 Update changelog and versions for 3.6.6. --- Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ gitian/versions | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6688bf1..e927d9c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,17 @@ +Tor Browser Bundle 3.6.6 -- Sep 24 2014 + * All Platforms + * Update Tor to tor-0.2.4.24 + * Update Firefox to 24.8.1esr + * Update NoScript to 2.6.8.42 + * Update HTTPS Everywhere to 4.0.1 + * Bug 12998: Prevent intermediate certs from being written to disk + * Update Torbutton to 1.6.12.3 + * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang + * Linux + * Bug 9150: Make RPATH unavailable on Tor binary. + * Bug 13031: Add full RELRO protection. + Tor Browser Bundle 3.6.5 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr diff --git a/gitian/versions b/gitian/versions index 4096ec0..c07a09d 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,15 +1,15 @@ -TORBROWSER_VERSION=3.6.5 +TORBROWSER_VERSION=3.6.6 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=24.8.1esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 -TOR_TAG=tor-0.2.4.23 +TOR_TAG=tor-0.2.4.24 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.12.1 +TORBUTTON_TAG=1.6.12.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -42,12 +42,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.0 +HTTPSE_VER=4.0.1 ## 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.8.39-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -75,8 +75,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=6b97c02b3ceab452f0ceec0f8918e0653837b24f376ba1a9dd78bb551bae3715 -HTTPSE_HASH=1241631091f9ceb417f639a6df76425cda36ee4b38b78ce8d318088eb17a7219 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 +HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Update changelog for 3.6.6, and add an omission to 4.0a3.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit a5c222038f94752618db15831e3a63a2120ff65a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:21:46 2014 -0700 Update changelog for 3.6.6, and add an omission to 4.0a3. --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index a41d0d5..6f3ea04 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,10 +10,25 @@ Tor Browser 4.0-alpha-3 -- Sep 24 2014 * Bug 13091: Use "Tor Browser" everywhere * Bug 13049: Browser update failure (self.update is undefined) * Bug 13047: Updater should not send Kernel and GTK version + * Bug 12998: Prevent intermediate certs from being written to disk * Linux: * Bug 9150: Make RPATH unavailable on Tor binary. * Bug 13031: Add full RELRO protection. +Tor Browser Bundle 3.6.6 -- Sep 24 2014 + * All Platforms + * Update Tor to tor-0.2.4.24 + * Update Firefox to 24.8.1esr + * Update NoScript to 2.6.8.42 + * Update HTTPS Everywhere to 4.0.1 + * Bug 12998: Prevent intermediate certs from being written to disk + * Update Torbutton to 1.6.12.3 + * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang + * Linux + * Bug 9150: Make RPATH unavailable on Tor binary. + * Bug 13031: Add full RELRO protection. + Tor Browser Bundle 4.0-alpha-2 -- Sep 2 2014 * All Platforms * Update Firefox to 24.8.0esr

1 0

[tor-browser-bundle/master] Bump versions and update changelog for 4.0a3.
by mikeperry＠torproject.org 24 Sep '14

24 Sep '14

commit 0d9c56ed19745b4bb5203d0ad0ad4d065235b03d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Sep 23 22:10:27 2014 -0700 Bump versions and update changelog for 4.0a3. --- Bundle-Data/Docs/ChangeLog.txt | 8 +++++--- gitian/versions.alpha | 10 +++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 24fb9b1..a41d0d5 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,12 @@ Tor Browser 4.0-alpha-3 -- Sep 24 2014 * All Platforms - * Update Tor to 0.2.5.7-rc + * Update Tor to 0.2.5.8-rc + * Update Firefox to 24.8.1esr * Update meek to 0.11 - * Update NoScript to 2.6.8.41 - * Update Torbutton to 1.6.12.2 + * Update NoScript to 2.6.8.42 + * Update Torbutton to 1.6.12.3 * Bug 13091: Use "Tor Browser" everywhere + * Bug 10804: Workaround fix for some cases of startup hang * Bug 13091: Use "Tor Browser" everywhere * Bug 13049: Browser update failure (self.update is undefined) * Bug 13047: Updater should not send Kernel and GTK version diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 25b35e5..66f0e52 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=24.8.1esr TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 -TOR_TAG=tor-0.2.5.7-rc +TOR_TAG=tor-0.2.5.8-rc TORLAUNCHER_TAG=0.2.7.0 -TORBUTTON_TAG=1.6.12.2 +TORBUTTON_TAG=1.6.12.3 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 @@ -52,7 +52,7 @@ GO_VER=1.3 ## 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.8.41-fx+sm+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.42-fx+fn+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.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 @@ -80,7 +80,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ac8b2febff44a437e00bd261570af9f7aba8cc2f49e69ffb631a0578af6facc1 +NOSCRIPT_HASH=b474156fd6b9957b38054a34c8acb581204f08733cce898ed581c67d425dda33 HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

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

23 Sep '14

commit 7f46869cd1b53e9a94dda54bd8101f66b78ed3ab Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 22 23:24:28 2014 -0700 Bump version and update changelog for 1.6.12.3. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index f5d32e9..1f925c6 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.12.3 + 23 Sep 2014 + * Bug 10804: Workaround for some TBB startup hangs + 1.6.12.2 22 Sep 2014 * Bug 13091: Use "Tor Browser" everywhere diff --git a/src/install.rdf b/src/install.rdf index 7e2f4fc..bf5ec16 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.2</em:version> + <em:version>1.6.12.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

[torbutton/master] Bug 10804: Relocate event queue draining inside control port call.
by mikeperry＠torproject.org 23 Sep '14

23 Sep '14

commit bc58adf6e2ba152cca0d92f5f828e3b8b2d06798 Author: Agent Smith <smith007(a)not.gov> Date: Fri Sep 19 18:28:40 2014 +0200 Bug 10804: Relocate event queue draining inside control port call. This patch relocates the event queue draining hack from bug #9531 from New Identity to all control port commands. This should help address hangs at startup due to HTTPS activity (and other usage of the control port while the TLS stack is live). --- src/chrome/content/torbutton.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4cd9c3d..9ded64b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1428,6 +1428,19 @@ function torbutton_array_to_hexdigits(array) { // Executes a command on the control port. // Return a string response upon success and null upon error. function torbutton_send_ctrl_cmd(command) { + + // We spin the event queue until it is empty and we can be sure that sending + // NEWNYM is not leading to a deadlock (see bug 9531 comment 23 for an + // invstigation on why and when this may happen). This is surrounded by + // suppressing/unsuppressing user initiated events in a window's document to + // be sure that these events are not interfering with processing events being + // in the event queue. + var thread = Cc["@mozilla.org/thread-manager;1"]. + getService(Ci.nsIThreadManager).currentThread; + m_tb_domWindowUtils.suppressEventHandling(true); + while (thread.processNextEvent(false)) {} + m_tb_domWindowUtils.suppressEventHandling(false); + try { var socketTransportService = Components.classes["@mozilla.org/network/socket-transport-service;1"] .getService(Components.interfaces.nsISocketTransportService); @@ -1700,18 +1713,6 @@ function torbutton_do_new_identity() { getService(Ci.nsIPermissionManager); pm.removeAll(); - // We spin the event queue until it is empty and we can be sure that sending - // NEWNYM is not leading to a deadlock (see bug 9531 comment 23 for an - // invstigation on why and when this may happen). This is surrounded by - // suppressing/unsuppressing user initiated events in a window's document to - // be sure that these events are not interfering with processing events being - // in the event queue. - var thread = Cc["@mozilla.org/thread-manager;1"]. - getService(Ci.nsIThreadManager).currentThread; - m_tb_domWindowUtils.suppressEventHandling(true); - while (thread.processNextEvent(false)) {} - m_tb_domWindowUtils.suppressEventHandling(false); - torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym.

1 0

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

23 Sep '14

commit 3c180c71ebadcea1e7913723f5404baba399d657 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 a58ce4a..93ed957 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -19,6 +19,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] 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] 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

[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