- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-4.5] Preparations for 4.5.3
by gk＠torproject.org 25 Jun '15

25 Jun '15

commit 208ed4d69784fe319231b403b63ce503b849b708 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 25 12:26:35 2015 +0000 Preparations for 4.5.3 --- Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ gitian/versions | 12 ++++++------ tools/update-responses/config.yml | 10 +++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e986e5c..c25ab38 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 4.5.3 -- June 30 2015 + * All Platforms + * Update Firefox to 31.8.0esr + * Update OpenSSL to 1.0.1o + * Update NoScript to 2.6.9.27 + * Update Torbutton to 1.9.2.8 + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + * Bug 16397: Fix crash related to disabling SVG + * Bug 16403: Set search parameters for Disconnect + Tor Browser 5.0a2 -- June 15 2015 * All Platforms * Update Tor to 0.2.7.1-alpha diff --git a/gitian/versions b/gitian/versions index a073427..940c8b4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.7.0esr +FIREFOX_VERSION=31.8.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 TOR_TAG=tor-0.2.6.9 TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.6 +TORBUTTON_TAG=1.9.2.8 HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -38,7 +38,7 @@ GITIAN_TAG=tor-browser-builder-3.x-8 OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build2 +FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -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.26-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.27-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e +NOSCRIPT_HASH=a59a2150a4fa03091afd670d86333b60b6516ccd104bcef918afe99460fb436a MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index fd9bd23..06d07dd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.0a2 - release: 4.5.2 + release: 4.5.3 versions: - 4.5.2: - platformVersion: 31.7.0 + 4.5.3: + platformVersion: 31.8.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/4.5.3 incremental_from: - - 4.5.1 + - 4.5.2 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit e2b23e56513bb5b02d020852fde54c3ee6c0b726 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 22:02:42 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Temporarily disable HTTP/2 pending audit. --- 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 da69e6e..596d925 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -104,8 +104,11 @@ pref("security.enable_tls_session_tickets", false); pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case +pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation pref("dom.workers.sharedWorkers.enabled", false); // See https://bugs.torproject.org/15562 +pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review +pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[torbutton/master] Bug #16403: Add tor source param to disconnect search
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 2cbce0ee6eb3518b28b933564f984b80793fd2dc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 21:54:45 2015 -0700 Bug #16403: Add tor source param to disconnect search --- src/chrome/locale/en/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 771f8ae..b923233 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -25,7 +25,7 @@ <!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.searchDCPost.link "https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <!ENTITY aboutTor.torInfo1.label "Additional Info:"> <!ENTITY aboutTor.torInfo2.label "Country & IP Address:">

1 0

[tor-browser/tor-browser-31.7.0esr-4.5-2] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 0204f7cdcc2262681675cbd474d0a1d04fc5aa2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 21:39:54 2015 -0700 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Add tor search parameter to disconnect. --- browser/locales/en-US/searchplugins/disconnect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml index 5b80262..cf755c2 100644 --- a/browser/locales/en-US/searchplugins/disconnect.xml +++ b/browser/locales/en-US/searchplugins/disconnect.xml @@ -3,7 +3,7 @@ <ShortName>Search</ShortName> <LongName>Disconnect Private Search</LongName> <Description>Private searches using disconnect.me</Description> - <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <Param name="query" value="{searchTerms}"/> </Url> <Image height="16" width="16" type="image/icon">data:image/x-icon;base64, AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAD///8B////Af///xP///9H////ff///43///+B////af///0X///8f////B////xP///9H////ff///4////9r////Af///wH///8Zd3d3r0NDQ/9BQUH/Tk5O925ubuGxsbGt////X////yX///8fd3d3rzs7O/8qKir/IiIi/////xP///8Z////LXp6erNERET/RERE/0NDQ/8+Pj7/MjIy/3BwcNX///9b////MXR0dK06Ojr/Kioq/yIiIv////9H////X////2d4eHi5Pj4+/0JCQv9ERET/Q0ND/zs7O/8wMDD/eXl5x////01iYmKjMjIy/ycnJ/8iIiL/fn5+v4eHh9N/f3/PUFBQ1UFBQc9BQUHlQ0ND/0RERP9AQED/NTU1/yoqKv/Jycl9WVlZey8vL8csLCzJKioqx0JCQv83Nzf/KCgo/0BAQN3///8l////A3Nzc1dISEj1Q0ND/zk5Of8pKSn/VVVVz////yn///8B////Af///wFCQkL/Nzc3/ygoKP9AQEDd////Jf///wH///8Nb29vpURERP87Ozv/Kioq/zIyMvH///8v////Af///wH///8BQkJC/zc3N/8oKCj/QEBA3f///yX///8B////Da2trWtDQ0P/Ozs7/yoqKv8iIiL/////L////wH///8B////AUJCQv83Nzf/KCgo/0FBQd3///8l////Bf///yW9vb2FQkJC/zg4OP8pKSn/IiIi/////yf///8B////Af///wFCQkL/Ojo6/y4uLv9LS0vh////Rf///zf///9jioqKzUBAQP8zMzP/JiYm/zMzM+H///8Z// //Af///wH///8BQ0ND/z8/P/87Ozv/Xl5e6f///4v///+PmpqazUNDQ/86Ojr/LS0t/yQkJP9ERESp////C////wH///8B////AURERP9DQ0P/Q0ND/0xMTPtoaGjtRERE/0NDQ/89PT3/MTEx/yYmJv8iIiL/e3t7Nf///wH///8B////Af///wFERET/RERE/0RERP9DQ0P/QkJC/0BAQP87Ozv/MTEx/ycnJ/8jIyP/RkZGc////wX///8B////Af///wH///8BOzs7/zs7O/87Ozv/Ojo6/zc3N/8zMzP/LS0t/yYmJv8jIyP/Ozs7ff///wX///8B////Af///wH///8B////ASoqKv8qKir/Kioq/yoqKv8pKSn/JiYm/y0tLckyMjKbU1NTKf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//w==</Image>

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 18b11197016751c3aec75c99feb7dfb798573719 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 21:39:54 2015 -0700 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Add tor search parameter to disconnect. --- browser/locales/en-US/searchplugins/disconnect.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml index 5b80262..cf755c2 100644 --- a/browser/locales/en-US/searchplugins/disconnect.xml +++ b/browser/locales/en-US/searchplugins/disconnect.xml @@ -3,7 +3,7 @@ <ShortName>Search</ShortName> <LongName>Disconnect Private Search</LongName> <Description>Private searches using disconnect.me</Description> - <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> + <Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_opt…"> <Param name="query" value="{searchTerms}"/> </Url> <Image height="16" width="16" type="image/icon">data:image/x-icon;base64, AAABAAEAEBAAAAAAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAD///8B////Af///xP///9H////ff///43///+B////af///0X///8f////B////xP///9H////ff///4////9r////Af///wH///8Zd3d3r0NDQ/9BQUH/Tk5O925ubuGxsbGt////X////yX///8fd3d3rzs7O/8qKir/IiIi/////xP///8Z////LXp6erNERET/RERE/0NDQ/8+Pj7/MjIy/3BwcNX///9b////MXR0dK06Ojr/Kioq/yIiIv////9H////X////2d4eHi5Pj4+/0JCQv9ERET/Q0ND/zs7O/8wMDD/eXl5x////01iYmKjMjIy/ycnJ/8iIiL/fn5+v4eHh9N/f3/PUFBQ1UFBQc9BQUHlQ0ND/0RERP9AQED/NTU1/yoqKv/Jycl9WVlZey8vL8csLCzJKioqx0JCQv83Nzf/KCgo/0BAQN3///8l////A3Nzc1dISEj1Q0ND/zk5Of8pKSn/VVVVz////yn///8B////Af///wFCQkL/Nzc3/ygoKP9AQEDd////Jf///wH///8Nb29vpURERP87Ozv/Kioq/zIyMvH///8v////Af///wH///8BQkJC/zc3N/8oKCj/QEBA3f///yX///8B////Da2trWtDQ0P/Ozs7/yoqKv8iIiL/////L////wH///8B////AUJCQv83Nzf/KCgo/0FBQd3///8l////Bf///yW9vb2FQkJC/zg4OP8pKSn/IiIi/////yf///8B////Af///wFCQkL/Ojo6/y4uLv9LS0vh////Rf///zf///9jioqKzUBAQP8zMzP/JiYm/zMzM+H///8Z// //Af///wH///8BQ0ND/z8/P/87Ozv/Xl5e6f///4v///+PmpqazUNDQ/86Ojr/LS0t/yQkJP9ERESp////C////wH///8B////AURERP9DQ0P/Q0ND/0xMTPtoaGjtRERE/0NDQ/89PT3/MTEx/yYmJv8iIiL/e3t7Nf///wH///8B////Af///wFERET/RERE/0RERP9DQ0P/QkJC/0BAQP87Ozv/MTEx/ycnJ/8jIyP/RkZGc////wX///8B////Af///wH///8BOzs7/zs7O/87Ozv/Ojo6/zc3N/8zMzP/LS0t/yYmJv8jIyP/Ozs7ff///wX///8B////Af///wH///8B////ASoqKv8qKir/Kioq/yoqKv8pKSn/JiYm/y0tLckyMjKbU1NTKf///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8B////Af///wH///8BAAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//w==</Image>

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 9a44958183f42b496f9e6d82bc53f4ed84f62933 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:48:10 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16254: Disable GeoIP-based search results. --- 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 b16737d..da69e6e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -59,6 +59,9 @@ pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. +pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) +pref("browser.search.region", "US"); +pref("browser.search.geoip.url", ""); // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d31de7a147a2634e7e8bef0ce48d6fd8e081c08e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:42:08 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable tiles for now until we can audit the real version in FF45-esr. --- 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 cddb430..b16737d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -58,6 +58,7 @@ pref("services.sync.engine.prefs", false); // Never sync prefs, addons, or tabs pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ +pref("browser.newtabpage.enhanced", false); // Bug 16316 - Avoid potential confusion over tiles for now. // Fingerprinting pref("webgl.min_capability_mode", true);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 7989c2c5a56006e2ae1d4988ea8e9ce1e26057d6 Merge: c1baf26 b8fc9ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:22:37 2015 -0700 Merge remote-tracking branch 'brade/bug16439-01' into tor-browser-38.1.0esr-5.x-1 browser/modules/moz.build | 6 +++++- toolkit/modules/moz.build | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] Bug 16439: remove screencasting code.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit b8fc9ed4eb889944b1f6d19723e11acb549b1bd5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 24 11:01:11 2015 -0400 Bug 16439: remove screencasting code. Screencasting is disabled in desktop browsers because browser.casting.enabled = false. However, to avoid including code that could lead to proxy bypass, we exclude the related JS modules from Tor Browser. --- browser/modules/moz.build | 6 +++++- toolkit/modules/moz.build | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/browser/modules/moz.build b/browser/modules/moz.build index 574455c..3c0162c 100644 --- a/browser/modules/moz.build +++ b/browser/modules/moz.build @@ -12,7 +12,6 @@ XPCSHELL_TESTS_MANIFESTS += [ EXTRA_JS_MODULES += [ 'BrowserUITelemetry.jsm', - 'CastingApps.jsm', 'Chat.jsm', 'ContentClick.jsm', 'ContentLinkHandler.jsm', @@ -39,6 +38,11 @@ EXTRA_JS_MODULES += [ 'WebappManager.jsm', ] +if not CONFIG['TOR_BROWSER_VERSION']: + EXTRA_JS_MODULES += [ + 'CastingApps.jsm', + ] + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES += [ 'Windows8WindowFrameColor.jsm', diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 35c9a80..6416ac4 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -44,7 +44,6 @@ EXTRA_JS_MODULES += [ 'RemoteSecurityUI.jsm', 'RemoteWebNavigation.jsm', 'RemoteWebProgress.jsm', - 'secondscreen/SimpleServiceDiscovery.jsm', 'SelectContentHelper.jsm', 'SelectParentHelper.jsm', 'sessionstore/FormData.jsm', @@ -66,7 +65,6 @@ EXTRA_PP_JS_MODULES += [ 'GMPInstallManager.jsm', 'GMPUtils.jsm', 'ResetProfile.jsm', - 'secondscreen/RokuApp.jsm', 'Services.jsm', 'Troubleshoot.jsm', 'UpdateChannel.jsm', @@ -74,6 +72,14 @@ EXTRA_PP_JS_MODULES += [ 'WindowsPrefSync.jsm', ] +if not CONFIG['TOR_BROWSER_VERSION']: + EXTRA_JS_MODULES += [ + 'secondscreen/SimpleServiceDiscovery.jsm', + ] + EXTRA_PP_JS_MODULES += [ + 'secondscreen/RokuApp.jsm', + ] + if 'Android' != CONFIG['OS_TARGET']: EXTRA_PP_JS_MODULES += [ 'LightweightThemeConsumer.jsm',

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/16357'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit a3d3114747cf8f758f7b650b141f4fdbdd10868f Merge: bdf2289 d8dfd2f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:13:49 2015 -0700 Merge remote-tracking branch 'arthur/16357' src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 16357: Use Mozilla API to wipe permissions db
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d8dfd2fbcf46240eddf5c20bc55d2f294856558f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Jun 12 16:56:05 2015 -0700 Bug 16357: Use Mozilla API to wipe permissions db --- src/chrome/content/torbutton.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5f4ba5c..0c48f30 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -20,6 +20,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); +let { Services } = Cu.import("resource://gre/modules/Services.jsm"); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -1769,8 +1770,7 @@ function torbutton_do_new_identity() { // This clears the STS cache and site permissions on Tor Browser // XXX: Tie to some kind of disk-ok pref? try { - m_tb_prefs.setBoolPref('permissions.memory_only', false); - m_tb_prefs.setBoolPref('permissions.memory_only', true); + Services.perms.removeAll(); } catch(e) { // Actually, this catch does not appear to be needed. Leaving it in for // safety though.

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit c1baf26f15edaf6964436175b98bf33d13531207 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 20:06:46 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #16222: Disable WebIDE to prevent remote debugging and addon downloads. --- browser/app/profile/000-tor-browser.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cffb790..cddb430 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -139,6 +139,11 @@ pref("browser.eme.ui.enabled", false); pref("media.gmp-eme-adobe.enabled", false); pref("media.eme.enabled", false); pref("media.eme.apiVisible", false); +// WebIDE can bypass proxy settings for remote debugging. It also downloads +// some additional addons that we have not reviewed. Turn all that off. +pref("devtools.webide.autoinstallADBHelper", false); +pref("devtools.webide.autoinstallFxdtAdapters", false); +pref("devtools.webide.enabled", false); // Security slider pref("svg.in-content.enabled", true);

1 0

[tor-launcher/master] Bug 16428: Use internal update URL
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 06f135535fac7e79be9051229030d195a44c84a7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 24 10:26:10 2015 +0000 Bug 16428: Use internal update URL We avoid using https://127.0.0.1 as update URL in order to omit scary Tor warnings (see: #13129). --- src/install.rdf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 2e9babc..0b8fc34 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -9,7 +9,8 @@ <em:id>tor-launcher(a)torproject.org</em:id> <em:version>0.2.7.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> - <em:updateURL>https://127.0.0.1/</em:updateURL> + <em:updateURL>data:text/plain,</em:updateURL> + <em:updateKey>-</em:updateKey>

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_16427'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit bdf2289fdcf4485a16ade68b51cbd6532ef460b9 Merge: d379c3e 2b9497e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 19:48:03 2015 -0700 Merge remote-tracking branch 'gk/bug_16427' src/install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Bug 16427: Use internal update URL
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 2b9497e060ac6e9610b695102e087b74a4474d19 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 24 10:30:04 2015 +0000 Bug 16427: Use internal update URL We avoid using https://127.0.0.1 as update URL in order to omit scary Tor warnings (see: #13129). --- src/install.rdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/install.rdf b/src/install.rdf index ae087f7..86a87db 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -10,8 +10,8 @@ <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> - <em:updateURL>https://127.0.0.1/</em:updateURL> -  + <em:updateURL>data:text/plain,</em:updateURL> + <em:updateKey>-</em:updateKey>  <em:targetApplication> <Description>

1 0

[torbutton/master] Bug 16200: Torbutton changes for ESR 38
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 699617776da868b4eabf982d23e7c901498905ef Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 22 13:43:43 2015 -0400 Bug 16200: Torbutton changes for ESR 38 Removed old, unused default preference values. --- src/defaults/preferences/preferences.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 4d1dee0..6b4ec0c 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -94,11 +94,6 @@ pref("extensions.torbutton.saved.appname_override",""); pref("extensions.torbutton.saved.appversion_override",""); pref("extensions.torbutton.saved.platform_override",""); pref("extensions.torbutton.saved.oscpu_override", ""); -pref("extensions.torbutton.saved.useragent_override", ""); -pref("extensions.torbutton.saved.productsub_override",""); -pref("extensions.torbutton.saved.buildID_override",""); -pref("extensions.torbutton.saved.useragent_vendor", ""); -pref("extensions.torbutton.saved.useragent_vendorSub",""); pref("extensions.torbutton.saved.transparentTor",false); pref("extensions.torbutton.saved.webgl_disabled", false); // network.dns.disablePrefetch is a hidden option. It has no default value: @@ -220,14 +215,6 @@ pref("extensions.torbutton.appversion_override","5.0 (Windows)"); pref("extensions.torbutton.platform_override","Win32"); pref("extensions.torbutton.oscpu_override", "Windows NT 6.1"); -pref("extensions.torbutton.useragent_override", - "Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0"); - -pref("extensions.torbutton.productsub_override","20100101"); -pref("extensions.torbutton.buildID_override","0"); -pref("extensions.torbutton.useragent_vendor", ""); -pref("extensions.torbutton.useragent_vendorSub",""); - pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true);

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug16200-02'
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d379c3e7992d18f5bab152c527f164b53b217ff6 Merge: d37746c 6996177 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 19:36:17 2015 -0700 Merge remote-tracking branch 'brade/bug16200-02' src/defaults/preferences/preferences.js | 13 ------------- 1 file changed, 13 deletions(-)

1 0

[torbutton/master] Bug 16200. Wipe cache on New Identity for TBB/FFESR38
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit d37746c1077bf65666c13fed761afba385c3bb07 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jun 8 00:19:25 2015 -0700 Bug 16200. Wipe cache on New Identity for TBB/FFESR38 (This updates and consolidates offline cache code as well.) --- src/chrome/content/torbutton.js | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3454613..5f4ba5c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,6 +19,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); +let { LoadContextInfo } = Cu.import('resource://gre/modules/LoadContextInfo.jsm'); + const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; @@ -1785,30 +1787,26 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Clearing Offline Cache"); - var cache = Components.classes["@mozilla.org/network/cache-service;1"]. - getService(Components.interfaces.nsICacheService); - try { - cache.evictEntries(Ci.nsICache.STORE_OFFLINE); + for (let contextInfo of [LoadContextInfo.default, LoadContextInfo.private]) { + let appCacheStorage = Services.cache2.appCacheStorage(contextInfo, null); + // The following call (asyncEvictStorage) is actually synchronous, either + // if we have pref "browser.cache.use_new_backend" -> 1 or + // "browser.cache.use_new_backend_temp" -> true, + // then we are using the new cache (cache2) which operates synchronously. + // If we are using the old cache, then the tor-browser.git patch for + // #5715 also makes this synchronous. So we pass a null callback. + appCacheStorage.asyncEvictStorage(null); + } } catch(e) { torbutton_log(5, "Exception on cache clearing: "+e); window.alert("Torbutton: Unexpected error during offline cache clearing: "+e); } - torbutton_log(3, "New Identity: Clearing LocalStorage"); - - try { - Components.utils.import("resource:///modules/offlineAppCache.jsm"); - OfflineAppCacheHelper.clear(); - } catch(e) { - torbutton_log(5, "Exception on localStorage clearing: "+e); - window.alert("Torbutton: Unexpected error during localStorage clearing: "+e); - } - - torbutton_log(3, "New Identity: Clearing Disk Cache"); + torbutton_log(3, "New Identity: Clearing Disk and Memory Caches"); try { - cache.evictEntries(0); + Services.cache2.clear(); } catch(e) { torbutton_log(5, "Exception on cache clearing: "+e); window.alert("Torbutton: Unexpected error during cache clearing: "+e);

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit e27dde72950d96837684f956949477ef87162313 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 19:38:34 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bump our useragent for FF38. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index f148f4d..cffb790 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -71,7 +71,7 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101");

1 0

[tor-browser/tor-browser-31.7.0esr-4.5-2] fixup! Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 612ae46e1344327c495cec13fd756807c22ff826 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jun 18 13:38:35 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. If an <object> is used to load an SVG from a .xml file, avoid dereferencing null pointers when script elements are created as generic elements (i.e., when svg.in-content.enabled=false). Fixes ticket #16397. --- content/xml/document/src/nsXMLContentSink.cpp | 12 +++++++++--- content/xml/document/src/nsXMLFragmentContentSink.cpp | 4 ++-- dom/xslt/xslt/txMozillaXMLOutput.cpp | 15 ++++++++------- parser/html/nsHtml5TreeOpExecutor.cpp | 2 ++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 104d80a..57ee45a 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -471,8 +471,10 @@ nsXMLContentSink::CreateElement(const char16_t** aAtts, uint32_t aAttsCount, || aNodeInfo->Equals(nsGkAtoms::script, kNameSpaceID_SVG) ) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(content); - sele->SetScriptLineNumber(aLineNumber); - sele->SetCreatorParser(GetParser()); + if (sele) { + sele->SetScriptLineNumber(aLineNumber); + sele->SetCreatorParser(GetParser()); + } mConstrainSize = false; } @@ -554,13 +556,17 @@ nsXMLContentSink::CloseElement(nsIContent* aContent) nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent); if (mPreventScriptExecution) { - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); return NS_OK; } // Always check the clock in nsContentSink right after a script StopDeflecting(); + if (!sele) + return NS_OK; + // Now tell the script that it's ready to go. This may execute the script // or return true, or neither if the script doesn't need executing. bool block = sele->AttemptToExecute(); diff --git a/content/xml/document/src/nsXMLFragmentContentSink.cpp b/content/xml/document/src/nsXMLFragmentContentSink.cpp index 738a769..29dd1a3 100644 --- a/content/xml/document/src/nsXMLFragmentContentSink.cpp +++ b/content/xml/document/src/nsXMLFragmentContentSink.cpp @@ -229,8 +229,8 @@ nsXMLFragmentContentSink::CloseElement(nsIContent* aContent) if (mPreventScriptExecution && aContent->Tag() == nsGkAtoms::script && (aContent->IsHTML() || aContent->IsSVG())) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aContent); - NS_ASSERTION(sele, "script did QI correctly!"); - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); } return NS_OK; } diff --git a/dom/xslt/xslt/txMozillaXMLOutput.cpp b/dom/xslt/xslt/txMozillaXMLOutput.cpp index 6b95345..45b8579 100644 --- a/dom/xslt/xslt/txMozillaXMLOutput.cpp +++ b/dom/xslt/xslt/txMozillaXMLOutput.cpp @@ -299,13 +299,14 @@ txMozillaXMLOutput::endElement() } else if ((ns == kNameSpaceID_XHTML || ns == kNameSpaceID_SVG) && localName == nsGkAtoms::script) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(element); - NS_ABORT_IF_FALSE(sele, "script elements need to implement nsIScriptElement"); - bool block = sele->AttemptToExecute(); - // If the act of insertion evaluated the script, we're fine. - // Else, add this script element to the array of loading scripts. - if (block) { - rv = mNotifier->AddScriptElement(sele); - NS_ENSURE_SUCCESS(rv, rv); + if (sele) { + bool block = sele->AttemptToExecute(); + // If the act of insertion evaluated the script, we're fine. + // Else, add this script element to the array of loading scripts. + if (block) { + rv = mNotifier->AddScriptElement(sele); + NS_ENSURE_SUCCESS(rv, rv); + } } } else if (ns == kNameSpaceID_XHTML && (localName == nsGkAtoms::input || diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 6c52e5f..fb377bd 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -636,6 +636,8 @@ nsHtml5TreeOpExecutor::RunScript(nsIContent* aScriptElement) NS_ASSERTION(aScriptElement, "No script to run"); nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aScriptElement); + if (!sele) + return; if (!mParser) { NS_ASSERTION(sele->IsMalformed(), "Script wasn't marked as malformed.");

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! Bug 1517: Reduce precision of time for Javascript.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit 1dd1d5c72cecfdfbee6b8526553407d84724dbdd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 17:50:31 2015 -0700 fixup! Bug 1517: Reduce precision of time for Javascript. Address worker thread performance.now() and also clip dom highres timestamps at 1ms in other cases (such as requestAnimationFrame()). --- dom/base/nsDOMNavigationTiming.h | 2 +- dom/workers/Performance.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dom/base/nsDOMNavigationTiming.h b/dom/base/nsDOMNavigationTiming.h index 7ae592c..e610891 100644 --- a/dom/base/nsDOMNavigationTiming.h +++ b/dom/base/nsDOMNavigationTiming.h @@ -91,7 +91,7 @@ public: inline DOMHighResTimeStamp TimeStampToDOMHighRes(mozilla::TimeStamp aStamp) { mozilla::TimeDuration duration = aStamp - mNavigationStartTimeStamp; - return duration.ToMilliseconds(); + return floor(duration.ToMilliseconds()); // Clamp to milliseconds at least } private: diff --git a/dom/workers/Performance.cpp b/dom/workers/Performance.cpp index 366e3ab..8dea08b 100644 --- a/dom/workers/Performance.cpp +++ b/dom/workers/Performance.cpp @@ -34,9 +34,8 @@ Performance::WrapObject(JSContext* aCx) double Performance::Now() const { - TimeDuration duration = - TimeStamp::Now() - mWorkerPrivate->NowBaseTimeStamp(); - return duration.ToMilliseconds(); + TimeDuration duration = TimeStamp::Now() - mWorkerPrivate->NowBaseTimeStamp(); + return floor(duration.ToMilliseconds()/100.0)*100.0; } END_WORKERS_NAMESPACE

1 0

[tor-browser/tor-browser-38.1.0esr-5.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 25 Jun '15

25 Jun '15

commit acccb97ea445f9209e7dce3ba4fae0569a646e12 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 24 17:59:36 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Disable resource and user timing APIs as per bugs 13024 and 16340. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d357f64..f148f4d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -91,6 +91,8 @@ pref("javascript.use_us_english_locale", true); pref("media.video_stats.enabled", false); // Disable device sensors as possible fingerprinting vector (bug 15758) pref("device.sensors.enabled", false); +pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API +pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser-bundle/master] We are on ESR
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit faa6152ada46c03bac9918dd69fa5646847be2e1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 11:24:12 2015 +0000 We are on ESR --- gitian/versions.nightly | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 6d69c68..70cfd91 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,7 +40,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1o GMP_VER=5.1.3 -FIREFOX_LANG_VER=38.0.1 #$FIREFOX_VERSION +FIREFOX_LANG_VER=38.0.1esr #$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.25 GCC_VER=5.1.0

1 0

[tor-browser-bundle/master] Bump nightly versions
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit 19712f39e9ad2051ce3138aecd5640cd9aaa3f78 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 11:11:25 2015 +0000 Bump nightly versions Note, we hardcode the Firefox version foe the language packs this time as the branch name of our pre-alpha Tor Browser branch does already contain the ESR version number of the upcoming release. --- gitian/versions.nightly | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 79051b3..6d69c68 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.7.0esr +FIREFOX_VERSION=38.1.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.x-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -40,7 +40,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1o GMP_VER=5.1.3 -FIREFOX_LANG_VER=$FIREFOX_VERSION +FIREFOX_LANG_VER=38.0.1 #$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.25 GCC_VER=5.1.0 @@ -60,7 +60,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.26-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.27-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=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e +NOSCRIPT_HASH=a59a2150a4fa03091afd670d86333b60b6516ccd104bcef918afe99460fb436a MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16351: Update our toolchain (Binutils/GCC)
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit 50e6d095bd8d8eaef460d0bddda9455ff222c685 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 15 14:24:54 2015 +0000 Bug 16351: Update our toolchain (Binutils/GCC) --- gitian/descriptors/windows/gitian-utils.yml | 3 -- gitian/patches/enable-reloc-section-ld.patch | 53 ++++++++----------- gitian/patches/gcc-dev-random.patch | 72 -------------------------- gitian/patches/peXXigen.patch | 27 +++++----- gitian/versions.alpha | 6 +-- gitian/versions.nightly | 6 +-- 6 files changed, 42 insertions(+), 125 deletions(-) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index bef262d..78da8a7 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -28,7 +28,6 @@ files: - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" -- "gcc-dev-random.patch" - "versions" - "dzip.sh" script: | @@ -66,8 +65,6 @@ script: | cd gcc tar -xjvf ../gcc.tar.bz2 cd gcc-* - # Don't use /dev/random on Windows. See bug 13169 for details. - patch -p1 < ../../gcc-dev-random.patch cd .. # We don't want to link against msvcrt.dll due to bug 9084. i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec diff --git a/gitian/patches/enable-reloc-section-ld.patch b/gitian/patches/enable-reloc-section-ld.patch index f393f51..5845d75 100644 --- a/gitian/patches/enable-reloc-section-ld.patch +++ b/gitian/patches/enable-reloc-section-ld.patch @@ -1,30 +1,23 @@ -From 093b08a9e7af23a258306b710ebc4556d12f94f7 Mon Sep 17 00:00:00 2001 +From 99ffc3f28b964519892cb1fb8bdc64d42b80d777 Mon Sep 17 00:00:00 2001 From: Erinn Clark <erinn(a)torproject.org> Date: Fri, 8 Aug 2014 14:23:44 -0400 Subject: [PATCH] add relocation section so Windows bundles can have ASLR Patch by skruffy. ---- - ld/emultempl/pe.em | 6 +++++ - ld/emultempl/pep.em | 8 ++++++- - ld/pe-dll.c | 63 ++++++++++++++++++++++++++++++----------------------- - ld/pe-dll.h | 1 + - 4 files changed, 50 insertions(+), 28 deletions(-) - diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em -index 5d6da9e..14c07f7 100644 +index 979cc8b..4a63863 100644 --- a/ld/emultempl/pe.em +++ b/ld/emultempl/pe.em -@@ -268,6 +268,7 @@ fragment <<EOF - #define OPTION_TERMINAL_SERVER_AWARE (OPTION_WDM_DRIVER + 1) - /* Determinism. */ +@@ -274,6 +274,7 @@ fragment <<EOF #define OPTION_INSERT_TIMESTAMP (OPTION_TERMINAL_SERVER_AWARE + 1) -+#define OPTION_ENABLE_RELOC_SECTION (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_NO_INSERT_TIMESTAMP (OPTION_INSERT_TIMESTAMP + 1) + #define OPTION_BUILD_ID (OPTION_NO_INSERT_TIMESTAMP + 1) ++#define OPTION_ENABLE_RELOC_SECTION (OPTION_BUILD_ID + 1) static void gld${EMULATION_NAME}_add_options -@@ -310,6 +311,7 @@ gld${EMULATION_NAME}_add_options +@@ -317,6 +318,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -32,7 +25,7 @@ index 5d6da9e..14c07f7 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -773,6 +775,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -787,6 +789,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pe_dll_exclude_all_symbols = 1; break; @@ -42,7 +35,7 @@ index 5d6da9e..14c07f7 100644 case OPTION_EXCLUDE_LIBS: pe_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1839,6 +1844,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -2059,6 +2064,7 @@ gld_${EMULATION_NAME}_finish (void) if (link_info.shared #if !defined(TARGET_IS_shpe) || (!link_info.relocatable && pe_def_file->num_exports != 0) @@ -51,20 +44,20 @@ index 5d6da9e..14c07f7 100644 ) { diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em -index b738800..b566903 100644 +index b24a608..caf2946 100644 --- a/ld/emultempl/pep.em +++ b/ld/emultempl/pep.em -@@ -242,7 +242,8 @@ enum options - OPTION_NO_BIND, - OPTION_WDM_DRIVER, +@@ -248,7 +248,8 @@ enum options OPTION_INSERT_TIMESTAMP, -- OPTION_TERMINAL_SERVER_AWARE -+ OPTION_TERMINAL_SERVER_AWARE, + OPTION_NO_INSERT_TIMESTAMP, + OPTION_TERMINAL_SERVER_AWARE, +- OPTION_BUILD_ID ++ OPTION_BUILD_ID, + OPTION_ENABLE_RELOC_SECTION }; static void -@@ -284,6 +285,7 @@ gld${EMULATION_NAME}_add_options +@@ -290,6 +291,7 @@ gld${EMULATION_NAME}_add_options {"export-all-symbols", no_argument, NULL, OPTION_EXPORT_ALL}, {"exclude-symbols", required_argument, NULL, OPTION_EXCLUDE_SYMBOLS}, {"exclude-all-symbols", no_argument, NULL, OPTION_EXCLUDE_ALL_SYMBOLS}, @@ -72,7 +65,7 @@ index b738800..b566903 100644 {"exclude-libs", required_argument, NULL, OPTION_EXCLUDE_LIBS}, {"exclude-modules-for-implib", required_argument, NULL, OPTION_EXCLUDE_MODULES_FOR_IMPLIB}, {"kill-at", no_argument, NULL, OPTION_KILL_ATS}, -@@ -727,6 +729,9 @@ gld${EMULATION_NAME}_handle_option (int optc) +@@ -743,6 +745,9 @@ gld${EMULATION_NAME}_handle_option (int optc) case OPTION_EXCLUDE_ALL_SYMBOLS: pep_dll_exclude_all_symbols = 1; break; @@ -82,7 +75,7 @@ index b738800..b566903 100644 case OPTION_EXCLUDE_LIBS: pep_dll_add_excludes (optarg, EXCLUDELIBS); break; -@@ -1618,6 +1623,7 @@ gld_${EMULATION_NAME}_finish (void) +@@ -1838,6 +1843,7 @@ gld_${EMULATION_NAME}_finish (void) #ifdef DLL_SUPPORT if (link_info.shared @@ -91,10 +84,10 @@ index b738800..b566903 100644 { pep_dll_fill_sections (link_info.output_bfd, &link_info); diff --git a/ld/pe-dll.c b/ld/pe-dll.c -index e9e133b..4230dc3 100644 +index 61d8fa5..24c0c72 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c -@@ -152,6 +152,7 @@ def_file * pe_def_file = 0; +@@ -151,6 +151,7 @@ def_file * pe_def_file = 0; int pe_dll_export_everything = 0; int pe_dll_exclude_all_symbols = 0; int pe_dll_do_default_excludes = 1; @@ -200,10 +193,10 @@ index e9e133b..4230dc3 100644 bfd_boolean diff --git a/ld/pe-dll.h b/ld/pe-dll.h -index 4697390..2bf71d9 100644 +index 24ea302..6a0d633 100644 --- a/ld/pe-dll.h +++ b/ld/pe-dll.h -@@ -31,6 +31,7 @@ extern def_file *pe_def_file; +@@ -30,6 +30,7 @@ extern def_file *pe_def_file; extern int pe_dll_export_everything; extern int pe_dll_exclude_all_symbols; extern int pe_dll_do_default_excludes; @@ -212,5 +205,5 @@ index 4697390..2bf71d9 100644 extern int pe_dll_stdcall_aliases; extern int pe_dll_warn_dup_exports; -- -2.0.1 +1.7.9.5 diff --git a/gitian/patches/gcc-dev-random.patch b/gitian/patches/gcc-dev-random.patch deleted file mode 100644 index 9757f92..0000000 --- a/gitian/patches/gcc-dev-random.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b0ce14899060267b5b5e4d7e3d91edcdf5c09514 Mon Sep 17 00:00:00 2001 -From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Tue, 10 Feb 2015 01:44:08 +0000 -Subject: [PATCH] * ssp.c (__guard_setup): For Windows, use approved methods - to get a suitable random number for the stack check guard - rather than reading /dev/random. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220559 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libssp/ChangeLog | 7 +++++++ - libssp/ssp.c | 16 ++++++++++++++++ - 2 files changed, 23 insertions(+) - -diff --git a/libssp/ChangeLog b/libssp/ChangeLog -index a445537..676d2a7 100644 ---- a/libssp/ChangeLog -+++ b/libssp/ChangeLog -@@ -1,3 +1,10 @@ -+2015-02-09 Georg Koppen <gk(a)torproject.org> -+ -+ * ssp.c: Conditionally include <windows.h> -+ (__guard_setup): For Windows, use approved methods to get -+ a suitable random number for the stack check guard rather -+ than reading /dev/random. -+ - 2014-07-16 Release Manager - - * GCC 4.9.1 released. -diff --git a/libssp/ssp.c b/libssp/ssp.c -index 96adf17..38e3ec8 100644 ---- a/libssp/ssp.c -+++ b/libssp/ssp.c -@@ -55,6 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* Native win32 apps don't know about /dev/tty but can print directly - to the console using "CONOUT$" */ - #if defined (_WIN32) && !defined (__CYGWIN__) -+#include <windows.h> - # define _PATH_TTY "CONOUT$" - #else - # define _PATH_TTY "/dev/tty" -@@ -75,6 +76,20 @@ __guard_setup (void) - if (__stack_chk_guard != 0) - return; - -+#if defined (_WIN32) && !defined (__CYGWIN__) -+ HCRYPTPROV hprovider = 0; -+ if (CryptAcquireContext(&hprovider, NULL, NULL, PROV_RSA_FULL, -+ CRYPT_VERIFYCONTEXT | CRYPT_SILENT)) -+ { -+ if (CryptGenRandom(hprovider, sizeof (__stack_chk_guard), -+ (BYTE *)&__stack_chk_guard) && __stack_chk_guard != 0) -+ { -+ CryptReleaseContext(hprovider, 0); -+ return; -+ } -+ CryptReleaseContext(hprovider, 0); -+ } -+#else - fd = open ("/dev/urandom", O_RDONLY); - if (fd != -1) - { -@@ -85,6 +100,7 @@ __guard_setup (void) - return; - } - -+#endif - /* If a random generator can't be used, the protector switches the guard - to the "terminator canary". */ - p = (unsigned char *) &__stack_chk_guard; --- -1.7.10.4 - diff --git a/gitian/patches/peXXigen.patch b/gitian/patches/peXXigen.patch index 785aa02..0ae0979 100644 --- a/gitian/patches/peXXigen.patch +++ b/gitian/patches/peXXigen.patch @@ -1,14 +1,13 @@ -diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c -*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 ---- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 -*************** -*** 795,800 **** ---- 795,802 ---- - /* Only use a real timestamp if the option was chosen. */ - if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); -+ else -+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); +diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c +index 13e39e4..deef7b3 100644 +--- a/bfd/peXXigen.c ++++ b/bfd/peXXigen.c +@@ -873,6 +873,8 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out) + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d34f0af..d883b0e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -39,8 +39,8 @@ OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 -BINUTILS_VER=2.24 -GCC_VER=4.9.1 +BINUTILS_VER=2.25 +GCC_VER=5.1.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -96,7 +96,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e +GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8eb91..73f8f73 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -42,8 +42,8 @@ OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 -BINUTILS_VER=2.24 -GCC_VER=4.9.1 +BINUTILS_VER=2.25 +GCC_VER=5.1.0 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -99,7 +99,7 @@ PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 GO_HASH=299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b -GCC_HASH=d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e +GCC_HASH=b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Merge branch 'bug_16351'
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit fd538cbe5226b82512e837c378647f83a21d724f Merge: ff23e83 50e6d09 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 10:46:47 2015 +0000 Merge branch 'bug_16351' gitian/descriptors/windows/gitian-utils.yml | 3 -- gitian/patches/enable-reloc-section-ld.patch | 53 ++++++++----------- gitian/patches/gcc-dev-random.patch | 72 -------------------------- gitian/patches/peXXigen.patch | 27 +++++----- gitian/versions.alpha | 6 +-- gitian/versions.nightly | 6 +-- 6 files changed, 42 insertions(+), 125 deletions(-)

1 0

[tor-browser-bundle/master] Merge branch 'bug_16210'
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit 6807f337314448d287a10d92516817fbae1cf5f4 Merge: d0bc63e ccb9a00 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 09:39:12 2015 +0000 Merge branch 'bug_16210' gitian/descriptors/linux/gitian-firefox.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[tor-browser-bundle/master] Bug 16210: Fix paths and stripping for ESR 38
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit ccb9a005e959b9812b654a9fd0c9d4937e051030 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 17 09:04:34 2015 +0000 Bug 16210: Fix paths and stripping for ESR 38 In addition to fixing broken paths and stripping Linux binaries we exempt |python 2.7| from libfaketime due to #13877, too. --- gitian/descriptors/linux/gitian-firefox.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index e7c8bfa..05b2beb 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -38,7 +38,6 @@ files: script: | source versions INSTDIR="$HOME/install" - export LIBRARY_PATH="$INSTDIR/lib" export CFLAGS="-frandom-seed=tor" export CXXFLAGS="-frandom-seed=tor" export TZ=UTC @@ -91,6 +90,7 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $INSTDIR/Debug/Browser/components + mkdir -p $INSTDIR/Debug/Browser/browser/components # Building libfaketime cd faketime @@ -115,9 +115,10 @@ script: | # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12461 comment 8 and later. Additionally, we need to avoid # breaking the ICU compilation. Exlcuding |bash| helps here. See #12461 - # comment 13. + # comment 13. Finally, we need to exclude |python2.7| as not doing so would + # stall the build right at the beginning. See #13877. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="bash,make" + export FAKETIME_SKIP_CMDS="python2.7,bash,make" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See @@ -158,9 +159,9 @@ script: | cp -p mar-tools-linux${GBUILD_BITS}.zip $OUTDIR/ # # Strip and generate debuginfo for the firefox binary that we keep, all *.so - # files, and the plugin-container (see ticket #10126) + # files, the plugin-container, and the updater (see ticket #10126) cd $INSTDIR - for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater + for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/components/*.so Browser/browser/components/*.so Browser/updater do objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB

1 0

[tor-browser-bundle/master] Bug 16181: Gitian changes for ESR 38 on OS X
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit ff23e83bcc9e5ade5fcbf954c449446c4044df78 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 23 10:40:20 2015 +0000 Bug 16181: Gitian changes for ESR 38 on OS X --- gitian/descriptors/mac/gitian-bundle.yml | 86 ++++++++------------- gitian/descriptors/mac/gitian-firefox.yml | 46 ++++++------ gitian/descriptors/mac/gitian-utils.yml | 115 +++++++++++++++++------------ gitian/fetch-inputs.sh | 6 +- gitian/mkbundle-mac.sh | 5 +- gitian/patches/libfaketime.patch | 54 ++++++++++++++ gitian/verify-tags.sh | 4 +- gitian/versions | 6 +- gitian/versions.alpha | 6 +- gitian/versions.nightly | 6 +- 10 files changed, 196 insertions(+), 138 deletions(-) diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 61a024b..255d327 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -64,13 +64,8 @@ script: | export TORBROWSER_VERSION=`cat bare-version` export LC_ALL=C umask 0022 - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - export TORBROWSER_APP="TorBrowserBundle" - export TORBROWSER_NAME="TorBrowserBundle" - else - export TORBROWSER_APP="TorBrowser" - export TORBROWSER_NAME="TorBrowserBundle" - fi + export TORBROWSER_APP="TorBrowser" + export TORBROWSER_NAME="TorBrowserBundle" # # Extract the MAR tools. unzip -d ~/build ~/build/mar-tools-mac$GBUILD_BITS.zip @@ -161,7 +156,7 @@ script: | tar -Jxvf ~/build/dmg-applications.tar.xz cd .. # - pushd $TORBROWSER_NAME.app/Contents/MacOS/browser/ + pushd $TORBROWSER_NAME.app/Contents/Resources/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. @@ -179,27 +174,21 @@ script: | unzip ~/build/TorBrowser.app.meek-http-helper.zip popd # - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app - rm -rf ~/build/${TORBROWSER_NAME}_en-US.app - else - # XXX: We need to insert these placeholders because otherwise mkisofs won't - # include these otherwise empty dirs: - touch ~/build/$TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches/placeholder.txt - # Recreate precomplete file (needs to be accurate for full MAR updates). - pushd ~/build/$TORBROWSER_NAME.app/ - rm -f precomplete - python $MARTOOLS/createprecomplete.py - popd - # - # Create full MAR file and disk image. - MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/$TORBROWSER_NAME.app - cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app - ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg - rm -rf ~/build/dmg/$TORBROWSER_APP.app - fi + # XXX: We need to insert these placeholders because otherwise mkisofs won't + # include these otherwise empty dirs: + touch ~/build/$TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches/placeholder.txt + # Recreate precomplete file (needs to be accurate for full MAR updates). + pushd ~/build/$TORBROWSER_NAME.app/Contents/Resources/ + rm -f precomplete + python $MARTOOLS/createprecomplete.py + popd + # + # Create full MAR file and disk image. + MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/$TORBROWSER_NAME.app + cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg + rm -rf ~/build/dmg/$TORBROWSER_APP.app mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app # unzip mac-langpacks.zip @@ -207,16 +196,12 @@ script: | for LANG in $BUNDLE_LOCALES do xpi=$LANG.xpi - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - DEST=${TORBROWSER_APP}_$LANG - else - DEST=$TORBROWSER_APP - fi + DEST=$TORBROWSER_APP cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app cp $xpi ~/build/dmg/$DEST.app/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - pushd ~/build/dmg/$DEST.app/Contents/MacOS/browser/ + pushd ~/build/dmg/$DEST.app/Contents/Resources/browser/ mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. @@ -225,28 +210,19 @@ script: | rm -rf defaults popd - # Set the update.locale (it is used to replace %LOCALE% within app.update.url). - pushd ~/build/dmg/$DEST.app/Contents/MacOS/ + # Set the update.locale (it is used to replace %LOCALE% within + # app.update.url) and recreate the precomplete file (needs to be accurate + # for full MAR updates). + pushd ~/build/dmg/$DEST.app/Contents/Resources/ echo "$LANG" > update.locale zip -Xm omni.ja update.locale + rm -f precomplete + python $MARTOOLS/createprecomplete.py popd - - if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then - pushd ~/build/dmg/ - ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app - rm -rf TorBrowserBundle_$LANG.app - popd - else - # Recreate precomplete file (needs to be accurate for full MAR updates). - pushd ~/build/dmg/$DEST.app/ - rm -f precomplete - python $MARTOOLS/createprecomplete.py - popd - # - MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app - ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ - rm -rf ~/build/dmg/$DEST.app - fi + # + MAR_FILE=tor-browser-osx${GBUILD_BITS}-${TORBROWSER_VERSION}_$LANG.mar + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE ~/build/dmg/$DEST.app + ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/ + rm -rf ~/build/dmg/$DEST.app cd mac-langpacks done diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e7a4dcb..e8f1046 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -16,11 +16,13 @@ remotes: - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" files: -- "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" +- "gcc-linux64-precise-utils.zip" +- "MacOSX10.7.sdk.tar.gz" - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" - "fix-info-plist.py" +- "libfaketime.patch" - "versions" script: | INSTDIR="$HOME/install/" @@ -34,25 +36,26 @@ script: | # 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 LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME=$REFERENCE_DATETIME cd .. - sudo dpkg -i *.deb - tar -xavf x86_64-apple-darwin10.tar.xz - # XXX: Needed for the otool patch. But we should replace that one with a - # better solution. See: comment 15 in - # https://bugzilla.mozilla.org/show_bug.cgi?id=936115 - export PATH=$PATH:/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin - # FIXME: path hacks: - sudo mkdir -p /System/Library/ - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk /usr/lib/apple/SDKs/MacOSX10.5.sdk - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/ /System/Library/ - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/PrivateFrameworks/ /System/Library/ - sudo ln -s /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/libstdc++.6.dylib /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/libstdc++.dylib + unzip -d $INSTDIR ~/build/gcc-linux64-precise-utils.zip + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $INSTDIR/gcc/bin/cc + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64 + # XXX: cross-compiler path is needed for ICU + export PATH=/home/ubuntu/build/x-tools/x86_64-apple-darwin10/bin:$INSTDIR/gcc/bin:$PATH + + tar xaf x86_64-apple-darwin10.tar.xz + tar xaf MacOSX10.7.sdk.tar.gz # cd tor-browser mv .mozconfig-mac .mozconfig @@ -72,11 +75,10 @@ script: | # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12812 comment 6 and #12461 comment 8 and later. # Additionally, we need to exclude |rsync| due to #10153 which is reproducible - # reliably with the new libfaketime. + # reliably with the new libfaketime and |python2.7| as well as the build would + # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - # XXX Order matters as for some reason the env variable has only the first - # command assigned when it comes to the rsync parts in the build process. - export FAKETIME_SKIP_CMDS="rsync,make" + export FAKETIME_SKIP_CMDS="python2.7,rsync,make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-macos package INNER_MAKE_PACKAGE=true @@ -101,11 +103,9 @@ script: | mv $INFO_PLIST tmp.plist ~/build/fix-info-plist.py $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST rm -f tmp.plist - ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja - ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja - if [ -f TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then # FF24 includes a third .ja - ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/browser/omni.ja - fi + ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/omni.ja + ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/webapprt/omni.ja + ~/build/re-dzip.sh TorBrowser.app/Contents/Resources/browser/omni.ja cd TorBrowser.app/ ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents cp tor-browser-mac${GBUILD_BITS}-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 6d93817..c47767e 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -4,11 +4,14 @@ suites: - "precise" architectures: - "i386" +- "amd64" packages: - "faketime" - "automake" - "libtool" - "zip" +# Needed for compiling GCC. +- "libmpc-dev" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" @@ -16,6 +19,7 @@ remotes: 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" +- "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" - "versions" @@ -23,61 +27,76 @@ files: script: | INSTDIR="$HOME/install" source versions - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 - export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 - sudo dpkg -i *.deb - tar xaf multiarch-darwin*tar.xz - export PATH="$PATH:$HOME/build/apple-osx/bin/" - # For OpenSSL - ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc - #For gmp, need to trick it so it knows we're doing a 64 bit build - for i in ~/build/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; + if [ $GBUILD_BITS == "64" ]; + then + # Building GCC. We need this as Firefox ESR 38 has GCC 4.7 as minimum + # requirement for the host compiler but Ubuntu Precise is only shipping 4.6. + tar xaf gcc.tar.bz2 + cd gcc-* + ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + make $MAKEOPTS + make install + cd $INSTDIR + ~/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 + export FAKETIME=$REFERENCE_DATETIME - # XXX Clean up these flags? - export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + sudo dpkg -i *.deb + tar xaf multiarch-darwin*tar.xz + export PATH="$PATH:$HOME/build/apple-osx/bin/" + # For OpenSSL + ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + #For gmp, need to trick it so it knows we're doing a 64 bit build + for i in ~/build/apple-osx/bin/i686-apple-darwin11-*; do j=`echo $i | sed 's/i686/x86_64/'`; ln -s $i $j; done; - # Building Libevent - cd libevent - ./autogen.sh - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent - make $MAKEOPTS - make install - cd .. + # XXX Clean up these flags? + export CFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-m64 -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" - # Building OpenSSL - tar xzf openssl.tar.gz - cd openssl-* - find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. - ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 - # Using $MAKEOPTS breaks the build. Might be the issue mentioned on - # http://cblfs.cross-lfs.org/index.php/OpenSSL. - make - make install - cd .. + # Building Libevent + cd libevent + ./autogen.sh + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + make $MAKEOPTS + make install + cd .. - # Building GMP - tar xjf gmp.tar.bz2 - cd gmp-* - 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 - make - make install - cd .. + # Building OpenSSL + tar xzf openssl.tar.gz + cd openssl-* + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" + # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. + ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 + # Using $MAKEOPTS breaks the build. Might be the issue mentioned on + # http://cblfs.cross-lfs.org/index.php/OpenSSL. + make + make install + cd .. - # Grabbing the results - cd $INSTDIR - ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl - ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent - ~/build/dzip.sh gmp-$GMP_VER-mac64-utils.zip gmp + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + 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 + make + make install + cd .. - cp *utils.zip $OUTDIR/ + # Grabbing the results + cd $INSTDIR + ~/build/dzip.sh openssl-$OPENSSL_VER-mac64-utils.zip openssl + ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac64-utils.zip libevent + ~/build/dzip.sh gmp-$GMP_VER-mac64-utils.zip gmp + + cp *utils.zip $OUTDIR/ + fi diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 63460e8..2a5bd16 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,7 +132,7 @@ do fi done -for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK MSVCR100 +for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK OSXSDK_OLD MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -166,8 +166,8 @@ done wget -U "" -N ${NOSCRIPT_URL} # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index ea547e9..363ebb1 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -106,7 +106,8 @@ fi cd $GITIAN_DIR -if [ ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ +if [ ! -f inputs/gcc-$GCC_VER-linux64-precise-utils.zip -o \ + ! -f inputs/openssl-$OPENSSL_VER-mac64-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip -o \ ! -f inputs/gmp-$GMP_VER-mac64-utils.zip ]; then @@ -122,6 +123,7 @@ then cd inputs cp -a ../build/out/*-utils.zip . + ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip @@ -135,6 +137,7 @@ else # We might have built the utilities in the past but maybe the links are # pointing to the wrong version. Refresh them. cd inputs + ln -sf gcc-$GCC_VER-linux64-precise-utils.zip gcc-linux64-precise-utils.zip ln -sf openssl-$OPENSSL_VER-mac64-utils.zip openssl-mac64-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac64-utils.zip libevent-mac64-utils.zip ln -sf gmp-$GMP_VER-mac64-utils.zip gmp-mac64-utils.zip diff --git a/gitian/patches/libfaketime.patch b/gitian/patches/libfaketime.patch new file mode 100644 index 0000000..d170eda --- /dev/null +++ b/gitian/patches/libfaketime.patch @@ -0,0 +1,54 @@ +From 3ea3df1129a9918dea7efdf3a529227f16b237aa Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Thu, 21 May 2015 07:32:16 +0000 +Subject: [PATCH] Allow more than one command being skipped + +--- + src/libfaketime.c | 28 ++++++++++++++++++++-------- + 1 file changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/libfaketime.c b/src/libfaketime.c +index ecda143..ad45857 100644 +--- a/src/libfaketime.c ++++ b/src/libfaketime.c +@@ -1455,17 +1455,29 @@ void __attribute__ ((constructor)) ftpl_init(void) + /* We can prevent faking time for specified commands */ + if ((tmp_env = getenv("FAKETIME_SKIP_CMDS")) != NULL) + { +- char *skip_cmd, *saveptr; +- skip_cmd = strtok_r(tmp_env, ",", &saveptr); +- while (skip_cmd != NULL) ++ char *skip_cmd, *saveptr, *tmpvar; ++ /* Don't mess with the env variable directly. */ ++ tmpvar = strdup(tmp_env); ++ if (tmpvar != NULL) + { +- if (0 == strcmp(progname, skip_cmd)) ++ skip_cmd = strtok_r(tmpvar, ",", &saveptr); ++ while (skip_cmd != NULL) + { +- ft_mode = FT_NOOP; +- dont_fake = true; +- break; ++ if (0 == strcmp(progname, skip_cmd)) ++ { ++ ft_mode = FT_NOOP; ++ dont_fake = true; ++ break; ++ } ++ skip_cmd = strtok_r(NULL, ",", &saveptr); + } +- skip_cmd = strtok_r(NULL, ",", &saveptr); ++ free(tmpvar); ++ tmpvar = NULL; ++ } ++ else ++ { ++ fprintf(stderr, "Error: Could not copy the environment variable value.\n"); ++ exit(EXIT_FAILURE); + } + } + +-- +2.1.4 + diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 5c1d552..2c4e8c6 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -140,8 +140,8 @@ do done # Verify packages with weak or no signatures via direct sha256 check -# (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +# (OpenSSL is signed with MD5, and OSXSDK + OSXSDK_OLD are not signed at all) +for i in OSXSDK OSXSDK_OLD TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 4a612c1..dc8b095 100755 --- a/gitian/versions +++ b/gitian/versions @@ -60,7 +60,8 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz +OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -81,7 +82,8 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf +OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e diff --git a/gitian/versions.alpha b/gitian/versions.alpha index c4b04cc..229e46d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -60,7 +60,8 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz +OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -81,7 +82,8 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf +OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e diff --git a/gitian/versions.nightly b/gitian/versions.nightly index cef40eb..27a2e27 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -63,7 +63,8 @@ GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb +OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz +OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -84,7 +85,8 @@ GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 -OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc +OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf +OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e

1 0

[tor-browser-bundle/master] Bug 15990: Gitian changes for ESR 38 on Windows
by gk＠torproject.org 23 Jun '15

23 Jun '15

commit d0bc63e7d7a1149c8faf336190d7a771eb46c234 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 28 09:23:00 2015 +0000 Bug 15990: Gitian changes for ESR 38 on Windows --- gitian/descriptors/windows/gitian-firefox.yml | 25 ++++++++++++------------- gitian/descriptors/windows/gitian-utils.yml | 10 ++++++++++ gitian/mkbundle-windows.sh | 3 +++ gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index ab8d7c6..c7efb62 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,8 +4,8 @@ suites: architectures: - "i386" packages: -- "autoconf2.13" - "unzip" +- "autoconf2.13" - "yasm" - "zip" reference_datetime: "2000-01-01 00:00:00" @@ -15,6 +15,7 @@ remotes: - "url": "https://github.com/wolfcw/libfaketime" "dir": "faketime" files: +- "gcc-linux32-precise-utils.zip" - "mingw-w64-win32-utils.zip" - "re-dzip.sh" - "dzip.sh" @@ -33,10 +34,15 @@ script: | # mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ + unzip -d $INSTDIR gcc-linux32-precise-utils.zip + # We need a link to our GCC, otherwise the system cc gets used which points to + # /usr/bin/gcc. + ln -s gcc $INSTDIR/gcc/bin/cc unzip -d $INSTDIR mingw-w64-win32-utils.zip unzip -d $INSTDIR gcclibs-win32-utils.zip - # Make sure our custom mingw gets used. - export PATH=$INSTDIR/mingw-w64/bin:$PATH + # Make sure our custom mingw and GCC (as host compiler) get used. + export LD_LIBRARY_PATH=$INSTDIR/gcc/lib + export PATH=$INSTDIR/mingw-w64/bin:$INSTDIR/gcc/bin:$PATH # Building libfaketime cd faketime @@ -90,23 +96,16 @@ script: | # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12811 comment 14 and #12461 comment 8 and later. + # Additionally, we need to exclude |python2.7| as well as the build would + # stall otherwise right at the beginning. See #13877 for details. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" - export FAKETIME_SKIP_CMDS="make" + export FAKETIME_SKIP_CMDS="python2.7,make" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ cp -a ~/build/msvcr100.dll $INSTDIR/Browser/ cp -a $INSTDIR/gcclibs/libssp-0.dll $INSTDIR/Browser/ - # - # What the hell are these three bytes anyways? - # FIXME: This was probably fixed by patching binutils. If we get matching - # builds without it, remove these two: - #sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/xul.dll - #sed 's/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8...\x04\xba\xcb\x7e/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/gkmedias.dll - # Stripping again updates the PE header checksums to be correct - i686-w64-mingw32-strip $INSTDIR/Browser/gkmedias.dll - i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll # Make MAR-based update tools available for use during the bundle phase. MARTOOLS=~/build/mar-tools diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 2b978e3..6e52c67 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -38,6 +38,15 @@ script: | export LC_ALL=C umask 0022 + # Building GCC to use it as the host compiler. Firefox 38 needs GCC >= 4.7 but + # Ubuntu Precise is only shipping with GCC 4.6.x. + tar xjf gcc.tar.bz2 + cd gcc-* + ./configure --prefix=$INSTDIR/gcc --disable-multilib --enable-languages=c,c++ + make $MAKEOPTS + make install + cd .. + # Building binutils tar xjf binutils.tar.bz2 cd binutils* @@ -157,6 +166,7 @@ script: | cd $INSTDIR # We might want to bump binutils independent of bumping mingw-w64. touch binutils-$BINUTILS_VER-win32-utils.zip + ~/build/dzip.sh gcc-$GCC_VER-linux32-precise-utils.zip gcc ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 4de847b..238ad51 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -102,6 +102,7 @@ cd $GITIAN_DIR if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/gcclibs-$GCC_VER-win32-utils.zip -o \ + ! -f inputs/gcc-$GCC_VER-linux32-precise-utils.zip -o \ ! -f inputs/mingw-w64-$GCC_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ @@ -127,6 +128,7 @@ then ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip + ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -142,6 +144,7 @@ else ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip ln -sf gcclibs-$GCC_VER-win32-utils.zip gcclibs-win32-utils.zip + ln -sf gcc-$GCC_VER-linux32-precise-utils.zip gcc-linux32-precise-utils.zip cd .. fi diff --git a/gitian/versions b/gitian/versions index a073427..4a612c1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? +MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 56b46b9..c4b04cc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? +MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index bea7547..cef40eb 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -19,7 +19,7 @@ HTTPSE_TAG=master NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? +MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master

1 0

[tor-browser-bundle/master] Bug 16011: Add a script to check authenticode sigs
by gk＠torproject.org 18 Jun '15

18 Jun '15

commit fa0f65f3f2b9be47c82dc931e0648b9dddfa8c05 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 8 13:29:49 2015 +0000 Bug 16011: Add a script to check authenticode sigs --- tools/authenticode_check.sh | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/tools/authenticode_check.sh b/tools/authenticode_check.sh new file mode 100755 index 0000000..86472ae --- /dev/null +++ b/tools/authenticode_check.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +# Copyright (c) 2015, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: + +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Let OSSLSIGNCODE point to your osslsigncode binary +# 2) Change into the directory containing the .exe files and the sha256sums.txt +# 3) Run /path/to/authenticode_check.sh + +if [ -z "$OSSLSIGNCODE" ] +then + echo "The path to your osslsigncode binary is missing!" + exit 1 +fi + +UNSIGNED_BUNDLES=0 +BADSIGNED_BUNDLES=0 + +mkdir tmp + +for f in `ls *.exe`; do + SHA256_TXT=`grep "$f" sha256sums.txt` + + # Test 1: Is the .exe file still unsigned? I.e. does its SHA 256 sum still + # match the one we had before we signed the .exe file? If so, notify us + # later and exit. + if [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + echo "$f has still the SHA 256 sum of the unsigned bundle!" + UNSIGNED_BUNDLES=`expr $UNSIGNED_BUNDLES + 1` + fi + + # Test 2: Do we get the old SHA 256 sum after stripping the authenticode + # signature? If not, notify us later and exit. + if [ "$UNSIGNED_BUNDLES" = "0" ] + then + # At least we seem to have attempted to sign the bundle. Let's see if we + # succeeded by stripping the signature. This behavior is reproducible. + # Thus, we know if we don't get the same SHA 256 sum we did not sign the + # bundle correctly. + echo "Trying to strip the authenticode signature of $f..." + ${OSSLSIGNCODE} remove-signature $f tmp/$f + cd tmp + if ! [ "$SHA256_TXT" = "`sha256sum $f`" ] + then + BADSIGNED_BUNDLES=`expr $BADSIGNED_BUNDLES + 1` + fi + cd .. + fi +done + +rm -rf tmp/ + +if ! [ "$UNSIGNED_BUNDLES" = "0" ] +then + echo "We got $UNSIGNED_BUNDLES unsigned bundle(s), exiting..." + exit 1 +fi + +if ! [ "$BADSIGNED_BUNDLES" = "0" ] +then + echo "We got $BADSIGNED_BUNDLES badly signed bundle(s), exiting..." + exit 1 +fi + +echo "The signatures are fine." +exit 0

1 0

[tor-browser-bundle/master] Merge branch 'bug_16011'
by gk＠torproject.org 18 Jun '15

18 Jun '15

commit c15148af3030d08c550d6b25261714e7f26d0f3d Merge: f35744d fa0f65f Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 18 08:02:54 2015 +0000 Merge branch 'bug_16011' tools/authenticode_check.sh | 95 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)

1 0

[tor-browser-bundle/master] Bug 16283: Bump VM_MEMORY to 4000 by default
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit 8b3ad7a6dd53a263a1bee8c9ddf0d304e59d856f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 3 13:50:07 2015 +0000 Bug 16283: Bump VM_MEMORY to 4000 by default Firefox is not happy with 2000 MiB RAM which is the current default. The build crashes randomly in this case. --- gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index 8d8f008..4b211a0 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -35,10 +35,10 @@ QuickStart: $ export NUM_PROCS=4 - To set the amount of RAM to use inside the VMs to 4000 MiB (the default is - 2000 MiB), use: + To set the amount of RAM to use inside the VMs to 8000 MiB (the default is + 4000 MiB), use: - $ export VM_MEMORY=4000 + $ export VM_MEMORY=8000 Detailed Explanation of Scripts: diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 15e1384..cb80214 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 01a9d1b..ea547e9 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index e7bdc87..4de847b 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -35,7 +35,7 @@ fi if [ -z "$VM_MEMORY" ]; then - export VM_MEMORY=2000 + export VM_MEMORY=4000 fi ./make-vms.sh

1 0

[tor-browser-bundle/master] Merge branch 'bug_16283'
by gk＠torproject.org 17 Jun '15

17 Jun '15

commit f35744d076aa2aeceeb5fd64faf1945b58ba435e Merge: f0f7fdb 8b3ad7a Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 17 13:43:47 2015 +0000 Merge branch 'bug_16283' gitian/README.build | 6 +++--- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)

1 0

[tor-browser-bundle/master] Bump nightly versions (Firefox/NoScript)
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit f0f7fdbdad8a6ac9fdfea1c00a84deefb816b7df Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:46:00 2015 +0000 Bump nightly versions (Firefox/NoScript) --- gitian/versions.nightly | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 73a5fe7..bea7547 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.6.0esr +FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master @@ -60,7 +60,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.21-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -87,7 +87,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bug 16388: Bump OpenSSL to 1.0.1o
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit c779ab8b929c2d800a2e85d36a7f9e8d118eac16 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:37:40 2015 +0000 Bug 16388: Bump OpenSSL to 1.0.1o --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions b/gitian/versions index e1bf555..a073427 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d34f0af..56b46b9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 5a8eb91..73a5fe7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ OBFS4_TAG=master GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -82,7 +82,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-4.5] Bug 16388: Bump OpenSSL to 1.0.1o
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit 64e129c8755a3cd0e0392cdbd149137ce41e32e1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 12:32:08 2015 +0000 Bug 16388: Bump OpenSSL to 1.0.1o --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index e1bf555..a073427 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1n +OPENSSL_VER=1.0.1o GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf +OPENSSL_HASH=16e678c6a05f2502811e075f2c4059ac01c878d091c9c585afc49ebc541f7b13 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Bug 16150: Take care of whitespace in filenames
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit e35d7c08cc2d9dbbe9c963573858dc49eb5ba563 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 21 13:15:49 2015 +0000 Bug 16150: Take care of whitespace in filenames It turned out that setting the timestamp to 2000-01-01 00:00:00 is breaking with Firefox 38 ESR as we have files with whitespaces there for the first time. The conversion was done with the following Perl snippet: perl -p -i -e 's/find -type f \| xargs/find -type f -print0 \| xargs -0/g' \ `find ./ -name *.yml` --- gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3a144ca..e7c8bfa 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -103,7 +103,7 @@ script: | cd tor-browser # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure # |configure| can't cope with nano seconds faked. And even if we would revert @@ -118,7 +118,7 @@ script: | # comment 13. export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" export FAKETIME_SKIP_CMDS="bash,make" - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make BUILD_HOSTNAME="gitian" $MAKEOPTS -f client.mk build # Packaging is broken with libfaketime enabled, thus we disable it again. See # #12461 comments 11 and 12 for details. diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 1130cdf..0f123ff 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -90,7 +90,7 @@ script: | # Building pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. @@ -98,7 +98,7 @@ script: | # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. @@ -106,7 +106,7 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. @@ -114,7 +114,7 @@ script: | # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. @@ -122,7 +122,7 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. @@ -130,7 +130,7 @@ script: | # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. @@ -138,7 +138,7 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/parsley.py $PTDIR/ cp -a build/ometa $PTDIR/ @@ -147,7 +147,7 @@ script: | # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -159,7 +159,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin @@ -170,7 +170,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ @@ -178,7 +178,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $INSTDIR/Docs/FlashProxy @@ -188,7 +188,7 @@ script: | # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make cp -ra fte $PTDIR/ mkdir -p $INSTDIR/Docs/libfte @@ -198,7 +198,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ mkdir -p $INSTDIR/Docs/fteproxy @@ -207,7 +207,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -215,7 +215,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client go build -ldflags '-s' cp -a meek-client $PTDIR @@ -230,7 +230,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -238,7 +238,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -246,7 +246,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -256,7 +256,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -264,7 +264,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index b218486..617e8df 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -87,7 +87,7 @@ script: | mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0646401..740a22c 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -79,7 +79,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -88,7 +88,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 @@ -125,7 +125,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + 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. # --enable-fat makes the binaries slightly bigger but fixes reproducibility diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index f609268..e7a4dcb 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -59,7 +59,7 @@ script: | # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure # |configure| can't cope with nano seconds faked. And even if we would revert @@ -67,7 +67,7 @@ script: | # reasons. export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We need libfaketime for all the timestamps e.g. written into the libraries. # BUT we need to exclude |make build| from it. Otherwise the build fails close # to the end, see #12812 comment 6 and #12461 comment 8 and later. diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 30f6444..d483462 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -105,7 +105,7 @@ script: | # Building pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. @@ -113,7 +113,7 @@ script: | # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-apple-darwin11 LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers @@ -124,7 +124,7 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. @@ -132,7 +132,7 @@ script: | # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. @@ -140,7 +140,7 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. @@ -148,7 +148,7 @@ script: | # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LDSHARED="$LDSHARED -framework Python" python setup.py build_ext --build-lib build -I/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/Python.framework/Headers python setup.py build --build-lib build cp -a build/twisted $PTDIR/ @@ -157,7 +157,7 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/parsley.py $PTDIR/ cp -a build/ometa $PTDIR/ @@ -166,7 +166,7 @@ script: | # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -178,7 +178,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin @@ -191,7 +191,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # We have to put $INSTDIR/openssl at the beginning of the header and library # search paths (build_ext otherwise puts it at the end, after CFLAGS and # LDFLAGS). The reason for this is that /usr/lib/apple/SDKs/MacOSX10.6.sdk/usr @@ -205,7 +205,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ mkdir -p $TBDIR/Docs/FlashProxy @@ -214,7 +214,7 @@ script: | # Building libfte cd libfte - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make cp -ra fte $PTDIR/ mkdir -p $TBDIR/Docs/libfte @@ -224,7 +224,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ mkdir -p $TBDIR/Docs/fteproxy @@ -233,7 +233,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -241,7 +241,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client # https://code.google.com/p/go/issues/detail?id=4714#c7 # We need cgo for crypto/x509 support on mac. @@ -258,7 +258,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -266,7 +266,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -274,7 +274,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -284,7 +284,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -292,7 +292,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 3d0e0c6..b3e4425 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -65,7 +65,7 @@ script: | mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --enable-static-openssl --disable-asciidoc --host=i686-apple-darwin11 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR make $MAKEOPTS make install diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 6729eeb..6d93817 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -45,7 +45,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -54,7 +54,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit OS X. ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin64-x86_64-cc --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on @@ -66,7 +66,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + 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 diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index c5f2c41..ab8d7c6 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -73,7 +73,7 @@ script: | # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure # |configure| can't cope with nano seconds faked. And even if we would revert @@ -81,7 +81,7 @@ script: | # reasons. export LD_PRELOAD="" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL}" - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # mkdir -p ~/build/bin/ cp ~/build/i686* ~/build/bin/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 339a63e..1d8caba 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -163,20 +163,20 @@ script: | # Building setuptools tar xzf setuptools.tar.gz cd setuptools-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Bulding pyptlib cd pyptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # This is bogus, that we run the configure script in the build environment, # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for # ac_cv_func_malloc_0_nonnull. @@ -188,14 +188,14 @@ script: | # Building argparse tar xzf argparse.tar.gz cd argparse-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null # Must create this file in order for py2exe to find the package. @@ -205,14 +205,14 @@ script: | # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" # rather than "Python.h". ln -sf Python.h $INSTDIR/python/include/python.h @@ -231,13 +231,13 @@ script: | # Building Parsley tar xzf parsley.tar.gz cd Parsley-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. # Building txsocksx cd txsocksx - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get # it downloaded during building. Just pretending and thus avoiding another # dependency should be fine here as txsocksx catches the exception due to @@ -251,7 +251,7 @@ script: | # Building obfsproxy cd obfsproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe LD_PRELOAD= $INSTPYTHON setup.py install py2exe_zip_timestomp py2exe_bundle/dist/obfsproxy.zip @@ -263,7 +263,7 @@ script: | # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. @@ -273,7 +273,7 @@ script: | # Building flashproxy cd flashproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" py2exe_zip_timestomp dist/flashproxy-client-win32/py2exe-flashproxy.zip cp -an dist/flashproxy-client-win32/{*.pyd,*.exe,*.zip} $PTDIR/ @@ -285,7 +285,7 @@ script: | cd libfte ln -s $INSTDIR/gmp thirdparty/gmp cp -a $INSTDIR/gmp/bin/libgmp-10.dll . - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= WINDOWS_BUILD=1 CROSS_COMPILE=1 PYTHON=$INSTPYTHON make LD_PRELOAD= $INSTPYTHON setup.py install mkdir -p $INSTDIR/Docs/libfte @@ -295,7 +295,7 @@ script: | # Building fteproxy cd fteproxy - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe py2exe_zip_timestomp dist/fteproxy.zip cp -an dist/{*.pyd,*.exe,*.zip} $PTDIR/ @@ -309,7 +309,7 @@ script: | # Building goptlib cd goptlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/goptlib.git" go install git.torproject.org/pluggable-transports/goptlib.git @@ -317,7 +317,7 @@ script: | # Building meek cd meek - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" cd meek-client go build -ldflags '-s' cp -a meek-client.exe $PTDIR @@ -336,7 +336,7 @@ script: | # Building go ed25519 cd ed25519 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/agl/" ln -sf "$PWD" "$GOPATH/src/github.com/agl/ed25519" go install github.com/agl/ed25519/extra25519 @@ -344,7 +344,7 @@ script: | # Building go siphash cd siphash - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/github.com/dchest/" ln -sf "$PWD" "$GOPATH/src/github.com/dchest/siphash" go install github.com/dchest/siphash @@ -352,7 +352,7 @@ script: | # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4) cd goxcrypto - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto" go install golang.org/x/crypto/curve25519 @@ -362,7 +362,7 @@ script: | # Building golang.org/x/net (obfs4proxy > 0.0.4) cd goxnet - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/golang.org/x/" ln -sf "$PWD" "$GOPATH/src/golang.org/x/net" go install golang.org/x/net/proxy @@ -370,7 +370,7 @@ script: | # Building obfs4proxy cd obfs4 - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" cd obfs4proxy diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 87e1dc2..edcc091 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -68,7 +68,7 @@ script: | export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-asciidoc --host=i686-w64-mingw32 --with-libevent-dir=$INSTDIR/libevent --with-openssl-dir=$INSTDIR/openssl --prefix=$INSTDIR --with-zlib-dir=$INSTDIR/zlib/ make $MAKEOPTS make install diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index bef262d..2b978e3 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -97,7 +97,7 @@ script: | cd .. # Second stage of gcc compilation cd gcc - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS make install mkdir -p $INSTDIR/gcclibs @@ -116,7 +116,7 @@ script: | export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" cd zlib - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" install cd .. @@ -124,7 +124,7 @@ script: | # Building Libevent cd libevent ./autogen.sh - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-w64-mingw32 --prefix=$INSTDIR/libevent make $MAKEOPTS make install @@ -133,7 +133,7 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl # Using $MAKEOPTS breaks the build. Might be the issue mentioned on @@ -145,7 +145,7 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" + 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 --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared

1 0

[tor-browser-bundle/master] Merge branch 'bug_16150_v2'
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit f1783ba6746b9facbd35273d665cd48a36eb9c2f Merge: c57e340 e35d7c0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 16 11:53:17 2015 +0000 Merge branch 'bug_16150_v2' gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-)

1 0

[tor-browser-bundle/master] Bug 14387: Make MAR signing process more verbose
by gk＠torproject.org 16 Jun '15

16 Jun '15

commit c57e340382377ccc1f0e376b23b621a1d7eef1d6 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 15 13:19:20 2015 +0000 Bug 14387: Make MAR signing process more verbose --- gitian/signmars.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/signmars.sh b/gitian/signmars.sh index ed42971..ea315ea 100755 --- a/gitian/signmars.sh +++ b/gitian/signmars.sh @@ -121,6 +121,7 @@ done TMPMAR="$SIGNED_DIR/tmp.mar" trap "rm -f $TMPMAR" EXIT cd "$UNSIGNED_DIR" +echo "Starting the signing..." COUNT=0 for marfile in *.mar; do if [ ! -f "$marfile" ]; then @@ -130,6 +131,7 @@ for marfile in *.mar; do "$marfile" "$TMPMAR" mv "$TMPMAR" "$SIGNED_DIR/$marfile" COUNT=$((COUNT + 1)) + echo "Signed MAR file $COUNT" done echo "The $COUNT MAR files located in $SIGNED_DIR/ have been signed."

1 0

[tor-browser-bundle/master] Bump release dates to June 15th.
by mikeperry＠torproject.org 11 Jun '15

11 Jun '15

commit 2ae79282688ccd01284fd4bddecc4ff72663c9d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 11 13:34:49 2015 -0700 Bump release dates to June 15th. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index de9fb59..e986e5c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 5.0a2 -- June 12 2015 +Tor Browser 5.0a2 -- June 15 2015 * All Platforms * Update Tor to 0.2.7.1-alpha * Update HTTPS-Everywhere to 5.0.5 @@ -18,7 +18,7 @@ Tor Browser 5.0a2 -- June 12 2015 * Bug 16026: Fix crash in GStreamer * Bug 16083: Update comment in start-tor-browser -Tor Browser 4.5.2 -- June 12 2015 +Tor Browser 4.5.2 -- June 15 2015 * All Platforms * Update Tor to 0.2.6.9 * Update HTTPS-Everywhere to 5.0.5

1 0

[tor-browser-bundle/master] Update versions and changelog for OpenSSL 1.0.1n.
by mikeperry＠torproject.org 11 Jun '15

11 Jun '15

commit c110b4fa7b8be0d6c511698f4c6668901e235c14 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 11 13:14:12 2015 -0700 Update versions and changelog for OpenSSL 1.0.1n. Also bump Tor to 0.2.6.9. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index df35913..de9fb59 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 5.0a2 -- June 12 2015 * All Platforms * Update Tor to 0.2.7.1-alpha * Update HTTPS-Everywhere to 5.0.5 + * Update OpenSSL to 1.0.1n * Update NoScript to 2.6.9.26 * Update meek to 0.19 * Update Torbutton to 1.9.2.7 @@ -19,8 +20,9 @@ Tor Browser 5.0a2 -- June 12 2015 Tor Browser 4.5.2 -- June 12 2015 * All Platforms - * Update Tor to 0.2.6.8 + * Update Tor to 0.2.6.9 * Update HTTPS-Everywhere to 5.0.5 + * Update OpenSSL to 1.0.1n * Update NoScript to 2.6.9.26 * Update Torbutton to 1.9.2.6 * Bug 15984: Disabling Torbutton breaks the Add-ons Manager diff --git a/gitian/versions b/gitian/versions index 9c0aac1..e1bf555 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 -TOR_TAG=tor-0.2.6.8 +TOR_TAG=tor-0.2.6.9 TORLAUNCHER_TAG=0.2.7.5 TORBUTTON_TAG=1.9.2.6 HTTPSE_TAG=5.0.5 @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2b2f6cd..d34f0af 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -35,7 +35,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-8 -OPENSSL_VER=1.0.1m +OPENSSL_VER=1.0.1n GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build2 @@ -79,7 +79,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 +OPENSSL_HASH=3581a405ccbe0fd1f6f17ea41773f77cdd51db55c01e1b4d8549e519882c6caf GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-launcher/master] Bump version to 0.2.7.6.
by brade＠torproject.org 10 Jun '15

10 Jun '15

commit d35ac816112de384e8e21c1c390e4bc5c1468b7e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jun 10 10:28:33 2015 -0400 Bump version to 0.2.7.6. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index b2ca19c..2e9babc 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.4</em:version> + <em:version>0.2.7.6</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-launcher/master] Bug 15145: Visually distinguish "proxy" and "bridge" screens.
by brade＠torproject.org 10 Jun '15

10 Jun '15

commit c12448c935c9af9725664c27fd5a2fd4b45e5688 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu May 21 15:10:51 2015 -0400 Bug 15145: Visually distinguish "proxy" and "bridge" screens. Add the following titles to the bridge and proxy wizard pages: "Tor Bridges Configuration" "Local Proxy Configuration" --- src/chrome/content/network-settings-wizard.xul | 56 +++++++++++++++++------- src/chrome/locale/en/network-settings.dtd | 2 + src/chrome/skin/network-settings.css | 5 +++ 3 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/chrome/content/network-settings-wizard.xul b/src/chrome/content/network-settings-wizard.xul index 9c75894..00c1682 100644 --- a/src/chrome/content/network-settings-wizard.xul +++ b/src/chrome/content/network-settings-wizard.xul @@ -57,10 +57,16 @@ <wizardpage pageid="bridges" next="proxy" onextra2="onCopyLog();" onpageshow="showWizardNavButtons(true);" onpageadvanced="return onWizardUseBridgesNext(this)"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/> + </vbox> + </hbox> + <separator /> <hbox> <vbox flex="1"> <label class="question">&torSettings.bridgeQuestion;</label> @@ -76,10 +82,16 @@ <wizardpage pageid="bridgeSettings" next="proxy" onextra2="onCopyLog();" onpageshow="onWizardBridgeSettingsShow();"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.bridgePageTitle;"/> + </vbox> + </hbox> + <separator /> <vbox> <label id="bridgeSettingsPrompt" class="question">&torSettings.bridgeSettingsPrompt;</label> @@ -90,10 +102,16 @@ <wizardpage pageid="proxy" onextra2="onCopyLog();" onpageshow="onWizardUseProxyRadioChange()" onpageadvanced="return onWizardProxyNext(this);"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/> + </vbox> + </hbox> + <separator /> <hbox> <vbox flex="1"> <label class="question">&torSettings.proxyQuestion;</label> @@ -111,10 +129,16 @@ <wizardpage pageid="proxyYES" onextra2="onCopyLog();" onpageshow="onWizardProxySettingsShow()" onpageadvanced="return (getAndValidateProxySettings() != null)"> - <vbox class="tbb-logo-box" align="start"> - <image class="tbb-logo" /> - </vbox> - <separator class="tbb-logo-separator" /> + <hbox class="tbb-header"> + <vbox class="tbb-logo-box" align="start"> + <image class="tbb-logo" /> + </vbox> + <separator class="tbb-logo-separator" orient="vertical" /> + <vbox pack="end"> + <label class="tbb-wizardpage-title" value="&torSettings.proxyPageTitle;"/> + </vbox> + </hbox> + <separator /> <label class="instructions">&torSettings.enterProxy;</label> <groupbox id="proxySpecificSettings" /> </wizardpage> diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 5ce6ee8..07d3d09 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -15,10 +15,12 @@ <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> <!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the 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.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 646baa6..6e173c3 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -99,6 +99,11 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { display: none; } +.tbb-wizardpage-title { + font-size: 115%; + font-weight: bold; +} + #bridgeDefaultEntry, #bridgeCustomEntry { margin-left: 1.8em;

1 0

[tor-browser-bundle/master] Preparations for 5.0a2
by gk＠torproject.org 05 Jun '15

05 Jun '15

commit 52317483ec963ff628ae35d27778042dbca0591a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 5 10:17:52 2015 +0000 Preparations for 5.0a2 --- Bundle-Data/Docs/ChangeLog.txt | 19 +++++++++++++++++++ gitian/versions.alpha | 14 +++++++------- tools/update-responses/config.yml | 9 ++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 14522bc..df35913 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,22 @@ +Tor Browser 5.0a2 -- June 12 2015 + * All Platforms + * Update Tor to 0.2.7.1-alpha + * Update HTTPS-Everywhere to 5.0.5 + * Update NoScript to 2.6.9.26 + * Update meek to 0.19 + * Update Torbutton to 1.9.2.7 + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Bug 14429: Make sure the automatic resizing is enabled + * Translation updates + * Bug 16130: Defend against logjam attack + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Windows + * Bug 16014: Staged update fails if meek is enabled + * Bug 16269: repeated add-on compatibility check after update (meek enabled) + * Linux + * Bug 16026: Fix crash in GStreamer + * Bug 16083: Update comment in start-tor-browser + Tor Browser 4.5.2 -- June 12 2015 * All Platforms * Update Tor to 0.2.6.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d2ff1e3..2b2f6cd 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 -TOR_TAG=tor-0.2.6.7 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-2-build1 +TOR_TAG=tor-0.2.7.1-alpha TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.5 -HTTPSE_TAG=5.0.3 +TORBUTTON_TAG=1.9.2.7 +HTTPSE_TAG=5.0.5 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.19 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -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.22-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 90524bd..fd9bd23 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.0a1 + alpha: 5.0a2 release: 4.5.2 versions: 4.5.2: @@ -23,13 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 5.0a1: + 5.0a2: platformVersion: 31.7.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/5.0a1 + download_url: https://www.torproject.org/dist/torbrowser/5.0a2 incremental_from: - - 4.5 - - 4.5a5 + - 5.0a1 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Bump version to 1.9.2.7
by gk＠torproject.org 05 Jun '15

05 Jun '15

commit 1b7833eaea2adbf100880cd50c6a81b1d47c28e6 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 5 09:52:22 2015 +0000 Bump version to 1.9.2.7 --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a46336a..7abf527 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.7 + * Bug 14429: Make sure the automatic resizing is enabled + 1.9.2.6 * Bug 15984: Disabling Torbutton breaks the Add-ons Manager * Bug 14429: Make sure the automatic resizing is disabled diff --git a/src/install.rdf b/src/install.rdf index 8379338..ae087f7 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.2.6</em:version> + <em:version>1.9.2.7</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] Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning.""
by gk＠torproject.org 05 Jun '15

05 Jun '15

commit edeaca158e86d1be1bea5bbb92cc6a3c9f481c23 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 5 06:47:31 2015 +0000 Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning."" This reverts commit f35b2f858359289d1c47967d34ca03bd678397c8. --- 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 68c4f60..4d1dee0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,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: @@ -159,7 +159,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

[tor-browser-bundle/master] Remove superfluous newline
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit 011515d18daa27b7163f8f595f1ec30c39ea2989 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 13:38:31 2015 +0000 Remove superfluous newline --- gitian/versions | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 74cf17c..9c0aac1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -61,7 +61,6 @@ NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb - MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2

1 0

[tor-browser-bundle/master] Preparations for 4.5.2
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit fa3c0784ed6feee6bb6a44a7ef17f3feeb57b7ee Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 13:28:16 2015 +0000 Preparations for 4.5.2 --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ gitian/versions | 13 +++++++------ tools/update-responses/config.yml | 9 ++++----- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ff3900..14522bc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,18 @@ +Tor Browser 4.5.2 -- June 12 2015 + * All Platforms + * Update Tor to 0.2.6.8 + * Update HTTPS-Everywhere to 5.0.5 + * Update NoScript to 2.6.9.26 + * Update Torbutton to 1.9.2.6 + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + * Bug 16130: Defend against logjam attack + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Linux + * Bug 16026: Fix crash in GStreamer + * Bug 16083: Update comment in start-tor-browser + Tor Browser 5.0a1 -- May 14 2015 * All Platforms * Update Firefox to 31.7.0esr diff --git a/gitian/versions b/gitian/versions index 3ec62bc..74cf17c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.7 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-2-build1 +TOR_TAG=tor-0.2.6.8 TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.3 -HTTPSE_TAG=5.0.3 +TORBUTTON_TAG=1.9.2.6 +HTTPSE_TAG=5.0.5 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -57,10 +57,11 @@ 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.22-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.26-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb + MSVCR100_PACKAGE=msvcr100.dll BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 @@ -84,7 +85,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 +NOSCRIPT_HASH=06d9fa6093378682a7fabfc0b2d156dfafcfda749ddd802970ce14d1860e6a3e MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index d8ec1ee..90524bd 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.0a1 - release: 4.5.1 + release: 4.5.2 versions: - 4.5.1: + 4.5.2: platformVersion: 31.7.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5.1 + download_url: https://www.torproject.org/dist/torbrowser/4.5.2 incremental_from: - - 4.5 - - 4.0.8 + - 4.5.1 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Preparations for 1.9.2.6
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit 2d06b26e60ee0bf2b21b5c2e8658c2786dd16b16 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 12:05:53 2015 +0000 Preparations for 1.9.2.6 Version bump, CHANGELOG update and translations update. --- src/CHANGELOG | 5 ++ src/chrome/locale/de/aboutTor.dtd | 2 +- src/chrome/locale/de/torbutton.properties | 2 +- src/chrome/locale/en/brand.dtd | 1 + src/chrome/locale/es/torbutton.properties | 2 +- src/chrome/locale/fr/torbutton.properties | 4 +- src/chrome/locale/ja/aboutTor.dtd | 2 +- src/chrome/locale/ja/brand.dtd | 8 +-- src/chrome/locale/ja/torbutton.dtd | 54 ++++++++--------- src/chrome/locale/ja/torbutton.properties | 32 +++++------ src/chrome/locale/ko/aboutTor.dtd | 28 ++++----- src/chrome/locale/nl/torbutton.properties | 6 +- src/chrome/locale/pl/torbutton.properties | 2 +- src/chrome/locale/pt/torbutton.dtd | 80 +++++++++++++------------- src/chrome/locale/pt/torbutton.properties | 6 +- src/chrome/locale/ru/torbutton.properties | 2 +- src/chrome/locale/zh-CN/torbutton.properties | 2 +- src/install.rdf | 2 +- 18 files changed, 123 insertions(+), 117 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 62d20d2..a46336a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.2.6 + * Bug 15984: Disabling Torbutton breaks the Add-ons Manager + * Bug 14429: Make sure the automatic resizing is disabled + * Translation updates + 1.9.2.5 * Translation updates diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index 25366b0..67e04ad 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "Dieser Browser ist nicht mehr aktuell."> <!ENTITY aboutTor.outOfDateTorOff.label "DIESER Browser ist auch veraltet."> -<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel and wählen Sie dann Überprüfe auf Tor-Browser Aktualisierung."> +<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung."> <!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen"> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 0643b70..8b57de6 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Dieser Browser torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Brücke torbutton.circuit_display.unknown_country = Unbekanntes Land -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.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen. torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren diff --git a/src/chrome/locale/en/brand.dtd b/src/chrome/locale/en/brand.dtd index cc65346..3df1a08 100644 --- a/src/chrome/locale/en/brand.dtd +++ b/src/chrome/locale/en/brand.dtd @@ -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/. --> +<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Tor Project"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index e732fa6..0715b9c 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = repetidor torbutton.circuit_display.tor_bridge = Repetidor puente (bridge) torbutton.circuit_display.unknown_country = País desconocido -torbutton.content_sizer.margin_tooltip = El navegador Tor agrega este margenes de alto y ancho de su ventana, esto reduce la posibilidad de la gente de rastrearlo en linea. +torbutton.content_sizer.margin_tooltip = El Navegador Tor añade este margen para hacer el ancho y el alto de su ventana menos distintivo, y reducir de esta forma la capacidad de la gente de rastrearle en línea. torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor torbutton.panel.plugins.disabled = Haga clic para habilitar extensiones (plugins). diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index f20d3b7..6304f07 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relais torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu -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.content_sizer.margin_tooltip = Le navigateur Tor ajoute cette marge pour s'assurer que la largeur et la hauteur de votre fenêtre soit moins distinctive, et ainsi réduire la capacité des personnes à vous repérer en ligne. torbutton.panel.tooltip.disabled = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.plugins.disabled = Cliquer pour activer les plugins @@ -15,7 +15,7 @@ torbutton.panel.plugins.enabled = Cliquer pour désactiver les plugins torbutton.panel.label.disabled = Tor Inactif torbutton.panel.label.enabled = Tor Actif extensions.torbutton(a)torproject.org.description = Torbutton fournit un bouton pour configurer les paramètres de Tor et nettoie rapidement et facilement les données de navigation privée. -torbutton.popup.history.warning = Torbutton a bloqué l'activité provenant d'un onglet ouvert dans un état Tor différent.\n\nCeci permet de contourner les bugs Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaître sans raison, un de vos onglets est en train de se rafraîchir en l'arrière-plan, et il a été bloqué.\n\nAfin de rafraîchir l'onglet dans l'état Tor actuel, faire "entrer" dans barre d'adresse de l'URL.\n\n +torbutton.popup.history.warning = Torbutton a bloqué l'activité provenant d'un onglet ouvert dans un état Tor différent.\n\nCeci permet de contourner les bugs Firefox 409737 et 417869.\n\nSi ce message d'erreur semble apparaître sans raison, un de vos onglets est en train de se rafraîchir en l'arrière-plan, et il a été bloqué.\n\nAfin de rafraîchir l'onglet dans l'état Tor actuel, appuyer sur "entrer" dans la barre d'adresse de l'URL.\n\n torbutton.popup.plugin.warning = Torbutton a bloqué le chargement direct par Tor du contenu du plugin.\n\nUtiliser plutôt la fonction Enregistrer sous.\n\n torbutton.popup.confirm_ca_certs = Info Torbutton: Vous n'avez pas de Certificat d'Autorité personnalisé. Examiner la liste des Certificats d'Autorité est une opération lente qui ralentit la bascule vers Tor. Voulez-vous désactiver l'isolation des Certificats d'Autorité ? (Si vous ne comprenez pas, il est bon de répondre OK) torbutton.popup.ff3.warning = Attention !\n\nTorbutton sur Firefox 3 est connu pour révéler votre fuseau horaire et vos livemarks par Tor.\n\nVoulez vous continuer malgré tout? diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index fe1edef..974820c 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "しかし、このブラウザは古いバージョンです。"> <!ENTITY aboutTor.outOfDateTorOff.label "また、このブラウザは古いバージョンです。"> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Onion をクリックして Tor Browser のアップデートを確認してください。"> <!ENTITY aboutTor.check.label "Torのネットワーク設定をテストする"> diff --git a/src/chrome/locale/ja/brand.dtd b/src/chrome/locale/ja/brand.dtd index 35a8894..2efb954 100644 --- a/src/chrome/locale/ja/brand.dtd +++ b/src/chrome/locale/ja/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "FirefoxおよびFirefoxのロゴはMozilla財団の登録商標です。">  -<!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 "クリックするとインストールされたシステムプラグインをロードします。"> +<!ENTITY plugins.installed.enable "プラグインを有効化"> +<!ENTITY plugins.installed.disable "プラグインを無効化"> +<!ENTITY plugins.installed.disable.tip "クリックするとインストールされたプラグインを読み込まなくします。"> diff --git a/src/chrome/locale/ja/torbutton.dtd b/src/chrome/locale/ja/torbutton.dtd index 4bdafc2..0abce4d 100644 --- a/src/chrome/locale/ja/torbutton.dtd +++ b/src/chrome/locale/ja/torbutton.dtd @@ -36,7 +36,7 @@ <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie の防御"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "TorのURLをコピー"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "あなたとほかのTorブラウザのユーザーを区別する詳細を変更"> <!ENTITY torbutton.prefs.sec_caption "セキュリティレベル"> <!ENTITY torbutton.prefs.sec_low "低い(デフォルト)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "最大の利便性を提供します。"> +<!ENTITY torbutton.prefs.sec_low_desc "このレベルでは、全てのブラウザーの機能が有効化されます。"> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "SVG OpenType フォントレンダリング機能は無効化されます。"> <!ENTITY torbutton.prefs.sec_med_low "中の低"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "このレベルでは、以下の変更が適用されます。(マウスを重ねると詳細を表示)"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 の映像と音楽は No-Script によりクリックするまで再生されません。"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "いくつかのサイトでは、メディアを有効にするために No-Script ツールバーを使う必要があります。"> +<!ENTITY torbutton.prefs.sec_some_jit_desc "いくつかの JavaScript のパフォーマンス最適化が無効化されます。"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、型インターフェイス、ASM.JS。"> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "基本的なJIT。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "サイトによってはスクリプトの動作が遅くなります。"> +<!ENTITY torbutton.prefs.sec_jar_desc "リモートの JAR ファイルがブロックされます。"> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Web 上で JAR ファイルが利用されることは稀ですが、 XSS などに使われることがあります。"> +<!ENTITY torbutton.prefs.sec_mathml_desc "数式を表示するためのいくつかの機能が無効化されます。"> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML が無効化されます。"> <!ENTITY torbutton.prefs.sec_med_high "中の上"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "全ての JavaScript のパフォーマンス最適化機能が無効化されます。"> +<!ENTITY torbutton.prefs.sec_font_rend_desc "いくつかのフォントレンダリング機能が無効化されます。"> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Graphite フォントレンダリング機能は無効化されます。"> +<!ENTITY torbutton.prefs.sec_svg_desc "いくつかの画像の種類が無効化されます。"> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG 画像は無効化されます。"> +<!ENTITY torbutton.prefs.sec_js_https_desc "HTTPS ではないサイトの JavaScript はデフォルトで無効化されます。"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "No-Script ツールバーからサイトごとに JavaScript を有効化できます。"> <!ENTITY torbutton.prefs.sec_high "高い"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "全てのサイトの JavaScript はデフォルトで無効化されます。"> +<!ENTITY torbutton.prefs.sec_audio_video_desc "ほとんどの映像と音楽形式は無効化されます。"> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM 形式だけが有効化されます。"> +<!ENTITY torbutton.prefs.sec_webfonts_desc "いくつかのフォントとアイコンは正常に表示されません。"> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Web サイトが提供するフォントはブロックされます。"> <!ENTITY torbutton.prefs.sec_custom "カスタム値"> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 0dfb4d6..554cd6f 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -1,13 +1,13 @@ torbutton.button.tooltip.disabled = Torを有効にする torbutton.button.tooltip.enabled = Torを無効にする -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.relay = relay -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country -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.circuit_display.internet = インターネット +torbutton.circuit_display.ip_unknown = 不明なIP +torbutton.circuit_display.onion_site = Onion サイト +torbutton.circuit_display.this_browser = このブラウザー +torbutton.circuit_display.relay = リレー +torbutton.circuit_display.tor_bridge = ブリッジ +torbutton.circuit_display.unknown_country = 不明な国 +torbutton.content_sizer.margin_tooltip = Tor Browser はウィンドウのサイズを平凡にするためにこのマージンを追加します。これにより、あなたのことをオンラインで追跡しにくくします。 torbutton.panel.tooltip.disabled = クリックしてTorを有効にする torbutton.panel.tooltip.enabled = クリックしてTorを無効にする torbutton.panel.plugins.disabled = プラグインを有効にする @@ -54,12 +54,12 @@ torbutton.popup.short_torbrowser = 重要なTorbuttonの情報!\n\nTorbuttonは torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたのプライバシーや匿名性を損なう恐れがあります。 \n\nそれらはTorを迂回しあなたの現在の位置やIPアドレスを漏らしてしまう恐れがあります。\n\n本当にプラグインを有効にしますか？\n\n torbutton.popup.never_ask_again = 次からはたずねない -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Browser は全てのウィンドウとタブを閉じようとしています。全てのセッションは失われます。\n\nあなたの情報をリセットするために Tor Browser を再起動しますか？\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Green onion menu にセキュリティレベルを調節するためのスライダーが追加されました！お試しください！ +torbutton.slider_notification_button = セキュリティの設定を開く -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Tor Browser を最大化すると、Webサイトはあなたのモニターサイズを利用して追跡できるようになります。Tor Browser のウィンドウのサイズは初期状態のままにしておくことをおすすめします。 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=このWebサイト(%S)がHTML5 canvas画像を使用しようとしています。これはあなたのコンピューターを識別するために使われる可能性があります。\n\nTor ブラウザーにHTML5 canvas画像の使用を許可しますか？ @@ -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 -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. +profileProblemTitle=%S プロファイル問題 +profileReadOnly=読み込み専用のファイルシステムでは %S を実行できません。 %S を別の場所に移動してからもう一度実行してください。 +profileReadOnlyMac=読み込み専用のファイルシステムでは %S を実行できません。 %S をデスクトップやアプリケーションフォルダーに移動してからもう一度実行してください。 +profileAccessDenied=%S はプロファイルにアクセスする権限がありません。権限を設定してからもう一度試してみてください。 diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 53f141e..523188e 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -4,20 +4,20 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "Tor란?"> +<!ENTITY aboutTor.title "Tor에 대해서"> -<!ENTITY aboutTor.outOfDateTorOn.label "그러나, 이 브라우저가 업데이트 되지 않았습니다."> -<!ENTITY aboutTor.outOfDateTorOff.label "또한, 이 브라우저가 업데이트 되지 않았습니다."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDateTorOn.label "그 러 나, 이 브라우저는 오래되었습니다."> +<!ENTITY aboutTor.outOfDateTorOff.label "또 한, 이 브라우저는 오래되었습니다."> +<!ENTITY aboutTor.outOfDate2.label "onion을 클릭하고 Tor Browser 업데이트 체크를 선택하세요."> <!ENTITY aboutTor.check.label "Tor 네트워크 설정 테스트"> <!ENTITY aboutTor.success.label "축하합니다!"> <!ENTITY aboutTor.success2.label "이 브라우저는 Tor를 사용하도록 구성되었습니다."> -<!ENTITY aboutTor.success3.label "여러분은 이제 익명으로 자유롭게 인터넷을 탐색 할 수 있습니다."> -<!ENTITY aboutTor.failure.label "뭔가 문제가 발생하였습니다."> -<!ENTITY aboutTor.failure2.label "Tor가 이 브라우저에서 작동하지 않습니다."> -<!ENTITY aboutTor.failure3prefix.label "도움이 필요한 경우 접속하시길 바랍니다."> +<!ENTITY aboutTor.success3.label "이제 자유롭게 익명으로 인터넷을 탐색할 수 있습니다."> +<!ENTITY aboutTor.failure.label "뭔가 잘못되었습니다!"> +<!ENTITY aboutTor.failure2.label "Tor는 이 브라우저에서 작동하지 않습니다."> +<!ENTITY aboutTor.failure3prefix.label "도움을 위해서, 문의해 주세요"> <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label " "> @@ -29,21 +29,21 @@ <!ENTITY aboutTor.torInfo1.label "추가 정보 :"> <!ENTITY aboutTor.torInfo2.label "국가 & IP 주소 :"> -<!ENTITY aboutTor.torInfo3.label "출구 node : "> +<!ENTITY aboutTor.torInfo3.label "출구 노드: "> <!ENTITY aboutTor.torInfo4.label "이 서버는 방문자에 대한 정보를 기록하지 않습니다."> <!ENTITY aboutTor.whatnextQuestion.label "그 다음은?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor는 절대로 '완벽한' 익명을 보장하는 브라우저가 아닙니다. 때문에 '완벽한' 익명을 위해서는 브라우저 사용 습관을 바꾸셔야 합니다."> +<!ENTITY aboutTor.whatnextAnswer.label "Tor는 완벽한 익명 브라우징을 보장하지 않습니다! 따라서 신분을 안전하게 유지하기 위해서는 브라우징 습관을 바꾸셔야 합니다."> <!ENTITY aboutTor.whatnext.label "익명으로 알짱거릴 때의 팁 >>"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "여러분도 도울 수 있습니다!"> <!ENTITY aboutTor.helpInfo2.label "여러분이 Tor 네트워크를 보다 빠르고 강하게 만들 수 있는 방법이 있습니다."> -<!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 >>"> +<!ENTITY aboutTor.helpInfo3.label "Tor 중계 서버 node 실행 »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "자원 봉사로 Tor 돕기 >>"> +<!ENTITY aboutTor.helpInfo4.label "자원 봉사로 Tor 돕기 »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "기부하기 >>"> +<!ENTITY aboutTor.helpInfo5.label "후원하기 »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor 프로젝트란? 온라인 익명 및 개인 정보 보호의 연구, 개발 및 교육에 힘쓰는 US 501(c)(3) 비영리 단체입니다."> -<!ENTITY aboutTor.learnMore.label "Tor 프로젝트에 대하여 더 알고 싶으시다면 >>"> +<!ENTITY aboutTor.learnMore.label "Tor 프로젝트에 대해서 더 알아보기 »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 0b7445b..08b77aa 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -1,13 +1,13 @@ torbutton.button.tooltip.disabled = Tor inschakelen torbutton.button.tooltip.enabled = Tor uitschakelen torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = Onbekend IP adres +torbutton.circuit_display.ip_unknown = IP-adres onbekend torbutton.circuit_display.onion_site = Onion-site torbutton.circuit_display.this_browser = Deze browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land -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.content_sizer.margin_tooltip = Tor Browser voegt deze rand toe om de afmetingen van het venster minder uit de toon te laten vallen. Dit maakt het moeilijker om u online te volgen. torbutton.panel.tooltip.disabled = Hier klikken om Tor in te schakelen torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen @@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten torbutton.slider_notification = Het groene ui menu heeft nu een schuif regelaar waar u uw veiligheids level aan kunt passen. Bekijk het eens! torbutton.slider_notification_button = Open de beveiligingsvoorkeuren -torbutton.maximize_warning = Het maximeren van Tor Browser stelt web paginas in de staat de grote van uw monitor vast te stellen en dat kan gebruik worden om u te tracken. Wij raden aan om het Tor Browser venster in zijn originele staat de laten. +torbutton.maximize_warning = Het maximaliseren van Tor Browser stelt webpagina's in staat uw beeldschermgrootte vast te stellen; dit kan worden gebruikt om u te traceren. We raden aan dat u vensters van Tor Browser in hun oorspronkelijke grootte laat. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=De website (%S) heeft geprobeerd HTML5 canvas image data op te vragen, wat kan gebruikt worden voor een unieke identificatie van je computer.\n\nMoet Tor Browser deze website toestaan om HTML5 canvas image data op te vragen? diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 78ba154..8b60e26 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Ta przeglądarka torbutton.circuit_display.relay = przekaźnik torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Nieznane państwo -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.content_sizer.margin_tooltip = Przeglądarka Tor dodaje ten margines po to, aby szerokość i wysokość okna Twojej przeglądarki była mniej charakterystyczna, dzięki temu zmniejszysz szanse śledzenia Ciebie online. torbutton.panel.tooltip.disabled = Kliknij tutaj, aby włączyć Tora torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora torbutton.panel.plugins.disabled = Kliknij aby włączyć wtyczki diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index 0ba6607..e946ff2 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -1,58 +1,58 @@ <!ENTITY torbutton.prefs.title "Preferências Torbutton"> <!ENTITY torbutton.prefs.tor_settings "Configurações do Proxy"> -<!ENTITY torbutton.prefs.recommended_settings "Utilizar as configurações recomendadas do proxy para minha versão do Firefox"> +<!ENTITY torbutton.prefs.recommended_settings "Utilize as configurações recomendadas do proxy para a minha versão do Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Utilizar Privoxy"> -<!ENTITY torbutton.prefs.use_polipo "Utilizar Privoxy"> -<!ENTITY torbutton.prefs.custom_settings "Utilizar configurações padrão do proxy"> +<!ENTITY torbutton.prefs.use_polipo "Utilizar Polipo"> +<!ENTITY torbutton.prefs.custom_settings "Utilize as configurações do proxy personalizadas"> <!ENTITY torbutton.prefs.proxy.host.http "Proxy HTTP:"> <!ENTITY torbutton.prefs.proxy.host.https "Proxy SSL:"> <!ENTITY torbutton.prefs.proxy.host.ftp "Proxy FTP:"> <!ENTITY torbutton.prefs.proxy.host.gopher "Proxy Gopher:"> -<!ENTITY torbutton.prefs.proxy.host.socks "Host SOCKS:"> -<!ENTITY torbutton.prefs.proxy.port "Porto:"> +<!ENTITY torbutton.prefs.proxy.host.socks "Hospedeiro SOCKS:"> +<!ENTITY torbutton.prefs.proxy.port "Porta:"> <!ENTITY torbutton.about.title "Sobre o Torbutton"> <!ENTITY torbutton.about.version "Versão:"> -<!ENTITY torbutton.about.summary "Protege a privacidade da navegação do Tor."> -<!ENTITY torbutton.about.code "Contribuidores de Código:"> +<!ENTITY torbutton.about.summary "Protege a privacidade da sua navegação Tor."> +<!ENTITY torbutton.about.code "Contribuidores do Código:"> <!ENTITY torbutton.about.maintainer "Mantenedor:"> <!ENTITY torbutton.about.security_review "Revisão de Segurança:"> -<!ENTITY torbutton.about.donate "Se gosta de usar o Tor, poderá considerar"> -<!ENTITY torbutton.about.make_donation "fazer uma doação"> -<!ENTITY torbutton.pref_connection.notice "Desactivar o Torbutton para mudar estas configurações."> -<!ENTITY torbutton.pref_connection.more_info "Mais informações"> +<!ENTITY torbutton.about.donate "Se gosta de utilizar o Tor, poderá considerar"> +<!ENTITY torbutton.about.make_donation "efetuar uma doação"> +<!ENTITY torbutton.pref_connection.notice "Desativar o Torbutton para alterar estas configurações."> +<!ENTITY torbutton.pref_connection.more_info "Mais informação"> <!ENTITY torbutton.pref_connection_more_info.title "Ajuda"> -<!ENTITY torbutton.pref_connection_more_info.text "Torbutton está activo. Se deseja mudar as configurações de Proxy que não sejam do Tor, por favor desactive o Torbutton e volte aqui. Se deseja alterar as configurações do Tor, por favor, use a janela de preferências do Torbutton."> +<!ENTITY torbutton.pref_connection_more_info.text "O Torbutton está ativado. Se desejar alterar as configurações do Proxy que não sejam do Tor, por favor, desative o Torbutton e volte aqui. Se desejar alterar as configurações do Tor, por favor, utilize a janela de preferências do Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Identidade Nova"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "Novo circuito Tor para este site"> +<!ENTITY torbutton.context_menu.new_circuit "Novo Circuito Tor para este Site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.toggle "Alterar Status Tor"> +<!ENTITY torbutton.context_menu.toggle "Alterar Estado do Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Definições de segurança e privacidade..."> +<!ENTITY torbutton.context_menu.preferences "Configurações de Segurança e Privacidade..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Sobre o Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Definições de rede do Tor..."> +<!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Procurar por atualizações do Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Procurar por Atualizações do Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "A"> -<!ENTITY torbutton.context_menu.cookieProtections "Proteções para Cookies..."> +<!ENTITY torbutton.context_menu.cookieProtections "Proteções para os Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Copiar endereço do Tor"> +<!ENTITY torbutton.context_menu.copyTor "Copiar URL do Tor"> <!ENTITY torbutton.context_menu.copyTor.key "P"> -<!ENTITY torbutton.context_menu.openTorTab "Abrir endereço do Tor numa nova Aba"> +<!ENTITY torbutton.context_menu.openTorTab "Abrir URL do Tor num novo Separador"> <!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Abrir endereço do Tor numa nova página"> +<!ENTITY torbutton.context_menu.openTorWindow "Abrir URL do Tor numa nova Janela"> <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> -<!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacidade e Definições de Segurança"> +<!ENTITY torbutton.button.tooltip "Clique para inicializar o Torbutton"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacidade e Configurações de Segurança"> <!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do Tor (crucial)"> -<!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do Tor (recomendado)"> -<!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do Tor (opcional)"> -<!ENTITY torbutton.prefs.block_nthwrite "Bloquear escrita no histórico durante a não utilização do Tor (opcional)"> -<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alterar o uso do Tor (opcional)"> -<!ENTITY torbutton.prefs.clear_cache "Bloquear a cópia local e limpar todos as cópias ao alterar o uso do Tor"> +<!ENTITY torbutton.prefs.block_thwrite "Bloquear a gravação no histórico durante a utilização do Tor (recomendado)"> +<!ENTITY torbutton.prefs.block_nthread "Bloquear a leitura do histórico durante a não utilização do Tor (opcional)"> +<!ENTITY torbutton.prefs.block_nthwrite "Bloquear a gravação no histórico durante a não utilização do Tor (opcional)"> +<!ENTITY torbutton.prefs.clear_history "Limpar histórico ao alternar a utilização do Tor (opcional)"> +<!ENTITY torbutton.prefs.clear_cache "Bloquear a cache do disco Tor e limpar toda a cache ao alternar a utilização do Tor"> <!ENTITY torbutton.prefs.block_cache "Bloquear cache de memória e disco durante o uso do Tor"> <!ENTITY torbutton.prefs.cookie_jars "Armazenar todos os cookies não-Tor num local protegido"> <!ENTITY torbutton.prefs.cookie_protection "Usar a caixa de diálogo das Proteções dos Cookies para escolher"> @@ -165,23 +165,23 @@ <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Linha de base JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Os scripts em alguns sítios poderão funcionar muito lentamente."> <!ENTITY torbutton.prefs.sec_jar_desc "Os ficheiros JAR remotos estão bloqueados."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Os ficheiros JAR são extremamente raros na Web, mas podem ser uma fonte de XSS e outros ataques."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Alguns mecanismos de visualização de equações matemáticas estão desativados."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML está desativado."> <!ENTITY torbutton.prefs.sec_med_high "Médio-Alto"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Todas as otimizações de desempenho JavaScript estão desativadas."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Algumas funções de renderização do tipo de letra estão desativadas."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "O mecanismo de renderização do tipo de letra Graphite está desativado."> +<!ENTITY torbutton.prefs.sec_svg_desc "Alguns tipos de imagens estão desativados."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "As imagens SVG estão desativadas."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript está desativado por predefinição em todos os sites não HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "O JavaScript pode ser ativado numa base de per-sítio através do botão da barra de ferramentas NoScript."> <!ENTITY torbutton.prefs.sec_high "Alto"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript está desativado por predefinição em todos os sítios."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "A maioria dos formatos de áudio e vídeo estão desativados."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM é o único codec que se mantém ativado."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Alguns tipos de letra e ícones poderão ser visualizados incorretamente."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Os ficheiros dos tipos de letra fornecidos pelo sítio da Web estão bloqueados."> <!ENTITY torbutton.prefs.sec_custom "Valores definidos"> <!ENTITY torbutton.circuit_display.title "Circuito Tor para este site"> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 0dc5004..ceec3a8 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = retransmitir torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = País desconhecido -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.content_sizer.margin_tooltip = O Navegador Tor adiciona esta margem para realçar a altura e a largura da sua janela, e com isso reduz a possibilidade de as pessoas on-line o possam rastrear. torbutton.panel.tooltip.disabled = Clique para ativar o Tor torbutton.panel.tooltip.enabled = Clique para desativar o Tor torbutton.panel.plugins.disabled = Clique para ativar os plugins @@ -56,10 +56,10 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = Agora, o menu da cebola verde tem um cursor de segurança que o deixa ajustar o seu nível de segurança. Verifique-o! torbutton.slider_notification_button = Abra as definições de segurança -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Ao maximizar o Navegador Tor pode permitir que os sítios da Web determinem o tamanho do seu monitor, o que poderá ser utilizado para o rastrear. Nós recomendamos que deixe as janelas do Navegador no seu tamanho original predefinido. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5? diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index a75acb7..62af84b 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = Этот браузер torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна -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.content_sizer.margin_tooltip = Tor Browser добавляет этот отступ, чтобы ширина и высота окна были менее узнаваемыми, и это усложняет возможность отследить Вас в сети. torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 8871ba6..385ce6c 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 -torbutton.content_sizer.margin_tooltip = Tor 浏览器添加此差额，使您的窗口宽度和高度总是稍有差异，从而减少人们跟踪您的在线活动的能力。 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加了这些边框，使浏览器窗口的宽高变得不再那么独特，从而让在线跟踪监视变得更难。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件 diff --git a/src/install.rdf b/src/install.rdf index ba6b09f..8379338 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.2.5</em:version> + <em:version>1.9.2.6</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] Revert "Bug 14429: Enable auto-resizing; disable maximization warning."
by gk＠torproject.org 04 Jun '15

04 Jun '15

commit f35b2f858359289d1c47967d34ca03bd678397c8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 4 12:01:18 2015 +0000 Revert "Bug 14429: Enable auto-resizing; disable maximization warning." This reverts commit 9690abf00de1dbc09fe070b72007a2fca3e6270c for the stable Tor Browser series. --- 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 4d1dee0..68c4f60 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,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: @@ -159,7 +159,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

[tor-browser/tor-browser-31.7.0esr-5.0-1] Bug 16026: Fix crash in GStreamer
by gk＠torproject.org 27 May '15

27 May '15

commit bc455d559db70c2106124492d9aa1e516b63ed52 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 22 07:38:56 2015 +0000 Bug 16026: Fix crash in GStreamer This is a backport of the patch attached to Mozilla's bug 1145230 (https://bugzilla.mozilla.org/show_bug.cgi?id=1145230) --- content/media/gstreamer/GStreamerReader.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp index e17f767..b9ba73b 100644 --- a/content/media/gstreamer/GStreamerReader.cpp +++ b/content/media/gstreamer/GStreamerReader.cpp @@ -220,12 +220,15 @@ void GStreamerReader::ElementAddedCb(GstBin *aPlayBin, GstElement *aElement, gpointer aUserData) { - const gchar *name = - gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(gst_element_get_factory(aElement))); - - if (!strcmp(name, "uridecodebin")) { - g_signal_connect(G_OBJECT(aElement), "autoplug-sort", - G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + GstElementFactory *factory = gst_element_get_factory(aElement); + if (factory) { + const gchar *name = + gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory)); + + if (!strcmp(name, "uridecodebin")) { + g_signal_connect(G_OBJECT(aElement), "autoplug-sort", + G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + } } }

1 0

[tor-browser/tor-browser-31.7.0esr-4.5-1] Bug 16026: Fix crash in GStreamer
by gk＠torproject.org 27 May '15

27 May '15

commit 9b5866c548c768b2a604d43896ce74e2a40848d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 22 07:38:56 2015 +0000 Bug 16026: Fix crash in GStreamer This is a backport of the patch attached to Mozilla's bug 1145230 (https://bugzilla.mozilla.org/show_bug.cgi?id=1145230) --- content/media/gstreamer/GStreamerReader.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp index e17f767..b9ba73b 100644 --- a/content/media/gstreamer/GStreamerReader.cpp +++ b/content/media/gstreamer/GStreamerReader.cpp @@ -220,12 +220,15 @@ void GStreamerReader::ElementAddedCb(GstBin *aPlayBin, GstElement *aElement, gpointer aUserData) { - const gchar *name = - gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(gst_element_get_factory(aElement))); - - if (!strcmp(name, "uridecodebin")) { - g_signal_connect(G_OBJECT(aElement), "autoplug-sort", - G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + GstElementFactory *factory = gst_element_get_factory(aElement); + if (factory) { + const gchar *name = + gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory)); + + if (!strcmp(name, "uridecodebin")) { + g_signal_connect(G_OBJECT(aElement), "autoplug-sort", + G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + } } }

1 0

[tor-browser/tor-browser-31.7.0esr-4.5-1] fixup! Bug 10280: Don't load any plugins into the address space.
by gk＠torproject.org 26 May '15

26 May '15

commit 2f614ed514155e5473499c027054de8aea77e726 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 11 11:16:12 2015 -0400 fixup! Bug 10280: Don't load any plugins into the address space. Overlay the about:addons page to avoid a direct dependency on entities that are defined in Torbutton. Fixes bug 15984. --- toolkit/mozapps/extensions/content/extensions.xul | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index b64937b..4eb01bf 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -359,14 +359,7 @@ command="cmd_pluginCheck"/> <spacer flex="5000"/>  </hbox> - <vbox id="plugin-disable-button" class="global-info" flex="1" - align="end"> - <button class="button-plugin-disable" - label="&plugins.installed.disable;" - tooltiptext="&plugins.installed.disable.tip;" - command="cmd_pluginDisable"/> - <spacer flex="5000"/> - </vbox> + <vbox id="plugin-disable-button" />  </hbox> <hbox class="view-header global-info-container experiment-info-container"> <hbox class="global-info" flex="1" align="center"> @@ -396,17 +389,7 @@ </vbox> <spacer class="alert-spacer-after"/> </vbox> - <vbox id="plugin-enable-button" class="alert-container" flex="1" - hidden="true"> - <spacer class="alert-spacer-before"/> - <vbox class="alert"> - <label value="&plugins.installed.find;"/> - <button class="button-plugin-enable" - label="&plugins.installed.enable;" - command="cmd_pluginEnable"/> - </vbox> - <spacer class="alert-spacer-after"/> - </vbox> + <vbox id="plugin-enable-button" />  <richlistbox id="addon-list" class="list" flex="1"/> </vbox>

1 0

[tor-browser/tor-browser-31.7.0esr-5.0-1] fixup! Bug 10280: Don't load any plugins into the address space.
by gk＠torproject.org 26 May '15

26 May '15

commit 86997f5baac6c1f0de8c84145a048b65716b35e7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 11 11:16:12 2015 -0400 fixup! Bug 10280: Don't load any plugins into the address space. Overlay the about:addons page to avoid a direct dependency on entities that are defined in Torbutton. Fixes bug 15984. --- toolkit/mozapps/extensions/content/extensions.xul | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul index b64937b..4eb01bf 100644 --- a/toolkit/mozapps/extensions/content/extensions.xul +++ b/toolkit/mozapps/extensions/content/extensions.xul @@ -359,14 +359,7 @@ command="cmd_pluginCheck"/> <spacer flex="5000"/>  </hbox> - <vbox id="plugin-disable-button" class="global-info" flex="1" - align="end"> - <button class="button-plugin-disable" - label="&plugins.installed.disable;" - tooltiptext="&plugins.installed.disable.tip;" - command="cmd_pluginDisable"/> - <spacer flex="5000"/> - </vbox> + <vbox id="plugin-disable-button" />  </hbox> <hbox class="view-header global-info-container experiment-info-container"> <hbox class="global-info" flex="1" align="center"> @@ -396,17 +389,7 @@ </vbox> <spacer class="alert-spacer-after"/> </vbox> - <vbox id="plugin-enable-button" class="alert-container" flex="1" - hidden="true"> - <spacer class="alert-spacer-before"/> - <vbox class="alert"> - <label value="&plugins.installed.find;"/> - <button class="button-plugin-enable" - label="&plugins.installed.enable;" - command="cmd_pluginEnable"/> - </vbox> - <spacer class="alert-spacer-after"/> - </vbox> + <vbox id="plugin-enable-button" />  <richlistbox id="addon-list" class="list" flex="1"/> </vbox>

1 0

[torbutton/master] Bug 15984: disabling Torbutton breaks the Add-ons manager
by gk＠torproject.org 26 May '15

26 May '15

commit 53f1a2cf0315ccd48f326227c20e51e136667558 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 11 11:05:15 2015 -0400 Bug 15984: disabling Torbutton breaks the Add-ons manager Overlay the about:addons page to avoid a direct dependency on entities that are defined in Torbutton. --- src/chrome.manifest | 2 ++ src/chrome/content/torbutton-extensions.xul | 28 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/chrome.manifest b/src/chrome.manifest index 6ef50dc..4dc08da 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -3,6 +3,8 @@ overlay chrome://browser/content/browser.xul chrome://torbutton/content/torbutto overlay chrome://browser/content/preferences/connection.xul chrome://torbutton/content/pref-connection.xul overlay chrome://messenger/content/messenger.xul chrome://torbutton/content/torbutton_tb.xul overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://torbutton/content/torbutton_tb.xul +overlay about:addons chrome://torbutton/content/torbutton-extensions.xul +overlay chrome://mozapps/content/extensions/extensions.xul chrome://torbutton/content/torbutton-extensions.xul resource torbutton ./ # browser branding diff --git a/src/chrome/content/torbutton-extensions.xul b/src/chrome/content/torbutton-extensions.xul new file mode 100644 index 0000000..060594d --- /dev/null +++ b/src/chrome/content/torbutton-extensions.xul @@ -0,0 +1,28 @@ +<?xml version="1.0"?> + +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/brand.dtd"> + +<overlay id="torbutton-extensions-overlay" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> + + <vbox id="plugin-enable-button" class="alert-container" flex="1" + hidden="true"> + <spacer class="alert-spacer-before"/> + <vbox class="alert"> + <label value="&plugins.installed.find;"/> + <button class="button-plugin-enable" + label="&plugins.installed.enable;" + command="cmd_pluginEnable"/> + </vbox> + <spacer class="alert-spacer-after"/> + </vbox> + + <vbox id="plugin-disable-button" class="global-info" flex="1" align="end"> + <button class="button-plugin-disable" + label="&plugins.installed.disable;" + tooltiptext="&plugins.installed.disable.tip;" + command="cmd_pluginDisable"/> + <spacer flex="5000"/> + </vbox> + +</overlay>

1 0

[tor-browser-bundle/master] Bug 16083: Update comment in start-tor-browser
by gk＠torproject.org 21 May '15

21 May '15

commit 30895033d3dc497cf38bfafdcf4aae323327d15f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 21 12:50:24 2015 +0000 Bug 16083: Update comment in start-tor-browser Thanks, cypherpunk. --- RelativeLink/start-tor-browser | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 940ec96..638c0c0 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -308,8 +308,8 @@ EOF # TOR_CONTROL_PASSWD='"secret"' # # Yes, the variable MUST be double-quoted, then single-quoted, exactly as -# shown. This is used by TorButtom to authenticate to Tor's ControlPort, and -# is necessary for using TBB with a with a system-installed Tor. +# shown. This is used by TorButton and Tor Launcher to authenticate to Tor's +# ControlPort, and is necessary for using TB with a system-installed Tor. # # Additionally, if using a system-installed Tor, the following about:config # options should be set (values in <> mean they are the value taken from your

1 0

[tor-browser-bundle/master] Changelog update; version bump for 5.0a1
by gk＠torproject.org 10 May '15

10 May '15

commit 7c759425b65eb7a2e7b42564d65f3cd784cc9ab5 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 10 08:44:42 2015 +0000 Changelog update; version bump for 5.0a1 --- Bundle-Data/Docs/ChangeLog.txt | 26 ++++++++++++++++++++++++++ gitian/versions.alpha | 4 ++-- tools/update-responses/config.yml | 14 +++++++++++++- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index cf257f0..7ff3900 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,29 @@ +Tor Browser 5.0a1 -- May 14 2015 + * All Platforms + * Update Firefox to 31.7.0esr + * Update meek to 0.18 + * Update Tor Launcher to 0.2.7.5 + * Translation updates only + * Update Torbutton to 1.9.2.5 + * Bug 15837: Show descriptions if unchecking custom mode + * Bug 15927: Force update of the NoScript UI when changing security level + * Bug 15915: Hide circuit display if it is disabled. + * Bug 14429: Improved automatic window resizing + * Translation updates + * Bug 15945: Disable NoScript's ClearClick protection for now + * Bug 15933: Isolate by base (top-level) domain name instead of FQDN + * Bug 15857: Fix file descriptor leak in updater that caused update failures + * Bug 15899: Fix errors with downloading and displaying PDFs + * Bug 15773: Enable ICU on OS X + * 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 15872: Fix meek pluggable transport startup issue with Windows 7 + * Build System + * Bug 15947: Support Ubuntu 14.04 LXC hosts via LXC_EXECUTE=lxc-execute env var + * Bugs 15921+15922: Fix build errors during Mozilla Tryserver builds + Tor Browser 4.5.1 -- May 12 2015 * All Platforms * Update Firefox to 31.7.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 89f8567..d2ff1e3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.0-1-build1 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.5 -TORBUTTON_TAG=1.9.2.3 +TORBUTTON_TAG=1.9.2.5 HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 12f5aa8..d8ec1ee 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: 4.5.1 + alpha: 5.0a1 release: 4.5.1 versions: 4.5.1: @@ -24,3 +24,15 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… + 5.0a1: + platformVersion: 31.7.0 + detailsURL: https://www.torproject.org/projects/torbrowser.html.en + download_url: https://www.torproject.org/dist/torbrowser/5.0a1 + incremental_from: + - 4.5 + - 4.5a5 + migrate_archs: + osx32: osx64 + osx32: + minSupportedOSVersion: 10.8 + detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda…

1 0

[torbutton/master] Translation updates; version bump
by gk＠torproject.org 10 May '15

10 May '15

commit ad46a7c9da59368c7c19844a049954d5485a9e0a Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 10 08:19:18 2015 +0000 Translation updates; version bump --- src/CHANGELOG | 3 +++ src/chrome/locale/ar/torbutton.properties | 1 + src/chrome/locale/de/torbutton.properties | 1 + src/chrome/locale/es/torbutton.properties | 1 + src/chrome/locale/eu/torbutton.properties | 1 + src/chrome/locale/fa/torbutton.properties | 1 + src/chrome/locale/fr/torbutton.properties | 1 + src/chrome/locale/it/torbutton.properties | 1 + src/chrome/locale/ja/torbutton.properties | 1 + src/chrome/locale/ko/torbutton.properties | 1 + src/chrome/locale/nl/torbutton.properties | 1 + src/chrome/locale/pl/torbutton.properties | 1 + src/chrome/locale/pt/torbutton.properties | 1 + src/chrome/locale/ru/torbutton.properties | 1 + src/chrome/locale/sv/torbutton.properties | 1 + src/chrome/locale/tr/torbutton.properties | 1 + src/chrome/locale/vi/torbutton.properties | 1 + src/chrome/locale/zh-CN/torbutton.properties | 1 + src/install.rdf | 2 +- 19 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index b014d2d..62d20d2 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.5 + * Translation updates + 1.9.2.4 * Bug 14429: Improved automatic window resizing diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index ef6dd71..6828a3e 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = هذا المتصفح torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = جسر torbutton.circuit_display.unknown_country = بلد غير معروف +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 = انقر لتفعيل تور torbutton.panel.tooltip.enabled = انقر لتعطيل تور torbutton.panel.plugins.disabled = انقر لتفعيل الملحقات diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index 53bc747..0643b70 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Dieser Browser torbutton.circuit_display.relay = Relais torbutton.circuit_display.tor_bridge = Brücke torbutton.circuit_display.unknown_country = Unbekanntes Land +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 = Klicken, um Tor zu aktivieren torbutton.panel.tooltip.enabled = Klicken, um Tor zu deaktivieren torbutton.panel.plugins.disabled = Klicken, um die Erweiterungen zu aktivieren diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 3812a7a..e732fa6 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = repetidor torbutton.circuit_display.tor_bridge = Repetidor puente (bridge) torbutton.circuit_display.unknown_country = País desconocido +torbutton.content_sizer.margin_tooltip = El navegador Tor agrega este margenes de alto y ancho de su ventana, esto reduce la posibilidad de la gente de rastrearlo en linea. torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor torbutton.panel.plugins.disabled = Haga clic para habilitar extensiones (plugins). diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index ae01c49..fd00c4d 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +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 torbutton.panel.plugins.disabled = Sakatu gehigarriak gaitzeko diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index e19af7f..cca2221 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = این مرورگر torbutton.circuit_display.relay = رله torbutton.circuit_display.tor_bridge = پل torbutton.circuit_display.unknown_country = کشور ناشناخته +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 = برای فعال کردن تُرکليک کنيد torbutton.panel.tooltip.enabled = برای غيرفعال کردن تُر کليک کنيد torbutton.panel.plugins.disabled = برای فعال کردن پلاگين ها کليک کنيد diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index c6a109e..f20d3b7 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Ce navigateur torbutton.circuit_display.relay = relais torbutton.circuit_display.tor_bridge = Pont torbutton.circuit_display.unknown_country = Pays inconnu +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 = Cliquer pour activer Tor torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.plugins.disabled = Cliquer pour activer les plugins diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index 9187d15..ab76409 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Questo browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Paese sconosciuto +torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, così si riduce la possibilità di che tu sia tracciato in linea. torbutton.panel.tooltip.disabled = Fai clic per attivare Tor torbutton.panel.tooltip.enabled = Fai clic per disattivare Tor torbutton.panel.plugins.disabled = Fai clic per attivare i plugin diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index fe40735..0dfb4d6 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +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 = クリックしてTorを有効にする torbutton.panel.tooltip.enabled = クリックしてTorを無効にする torbutton.panel.plugins.disabled = プラグインを有効にする diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index 1c3bf03..d44bcf9 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = 브릿지 torbutton.circuit_display.unknown_country = 미확인 국가 +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 = Tor를 활성화하려면 클릭 torbutton.panel.tooltip.enabled = Tor를 비활성화하려면 클릭 torbutton.panel.plugins.disabled = 플러그인을 활성화하려면 클릭 diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 9031caf..0b7445b 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Deze browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Onbekend land +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 = Hier klikken om Tor in te schakelen torbutton.panel.tooltip.enabled = Hier klikken om Tor uit te schakelen torbutton.panel.plugins.disabled = Hier klikken om plugins in te schakelen diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index e5b398c..78ba154 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Ta przeglądarka torbutton.circuit_display.relay = przekaźnik torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Nieznane państwo +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 = Kliknij tutaj, aby włączyć Tora torbutton.panel.tooltip.enabled = Kliknij tutaj, aby wyłączyć Tora torbutton.panel.plugins.disabled = Kliknij aby włączyć wtyczki diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 787dbd1..0dc5004 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.relay = retransmitir torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = País desconhecido +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 = Clique para ativar o Tor torbutton.panel.tooltip.enabled = Clique para desativar o Tor torbutton.panel.plugins.disabled = Clique para ativar os plugins diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index d70db02..a75acb7 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Этот браузер torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна +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 = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 6c2d180..2e853b0 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Denna webbläsare torbutton.circuit_display.relay = relä torbutton.circuit_display.tor_bridge = Brygga torbutton.circuit_display.unknown_country = Okänt land +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 = Klicka för att aktivera Tor torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor torbutton.panel.plugins.disabled = Klicka för att aktivera plugins diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 827c600..d5b857e 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = Bu tarayıcı torbutton.circuit_display.relay = ayna torbutton.circuit_display.tor_bridge = Köprü torbutton.circuit_display.unknown_country = Bilinmeyen ülke +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 = 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 diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index aa129d5..98b2883 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +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 = Nhấn để bật Tor torbutton.panel.tooltip.enabled = Nhấn để tắt Tor torbutton.panel.plugins.disabled = Nhấn để bật phần bổ trợ diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 0546132..8871ba6 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = 本浏览器 torbutton.circuit_display.relay = 中继 torbutton.circuit_display.tor_bridge = 网桥 torbutton.circuit_display.unknown_country = 未知国家 +torbutton.content_sizer.margin_tooltip = Tor 浏览器添加此差额，使您的窗口宽度和高度总是稍有差异，从而减少人们跟踪您的在线活动的能力。 torbutton.panel.tooltip.disabled = 点击启用 Tor torbutton.panel.tooltip.enabled = 点击禁用 Tor torbutton.panel.plugins.disabled = 点击启用插件 diff --git a/src/install.rdf b/src/install.rdf index 636beda..ba6b09f 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.2.4</em:version> + <em:version>1.9.2.5</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] Version bump
by gk＠torproject.org 10 May '15

10 May '15

commit a4b3b0553d2b4b9383ba78f10f99ca8424651922 Author: Georg Koppen <gk(a)torproject.org> Date: Sun May 10 08:14:08 2015 +0000 Version bump --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index d78bab0..b014d2d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.4 + * Bug 14429: Improved automatic window resizing + 1.9.2.3: * Bug 15837: Show descriptions if unchecking custom mode * Bug 15927: Force update of the NoScript UI when changing security level diff --git a/src/install.rdf b/src/install.rdf index dffaba7..636beda 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.2.3</em:version> + <em:version>1.9.2.4</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 #14429, Part 3. Improve behavior of content window resizer
by mikeperry＠torproject.org 09 May '15

09 May '15

commit 89a15ab99da7cc73074f4e5c53260a688f15ffe9 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Apr 1 17:57:29 2015 +0100 Bug #14429, Part 3. Improve behavior of content window resizer --- src/chrome/content/content-sizer.js | 503 +++++++++++++++++++++-------- src/chrome/content/torbutton.js | 35 +- src/chrome/locale/en/torbutton.properties | 1 + src/modules/utils.js | 15 +- 4 files changed, 395 insertions(+), 159 deletions(-) diff --git a/src/chrome/content/content-sizer.js b/src/chrome/content/content-sizer.js index f3710f7..e627c3c 100644 --- a/src/chrome/content/content-sizer.js +++ b/src/chrome/content/content-sizer.js @@ -3,28 +3,105 @@ // This file is formatted for docco.js. Later functions call earlier ones. +/* +TODO: +* Decide on quantization amount. 100x100? 200x100? Maybe gradually increase, like 50, 100, 150, 200, 300, 500, 600, 800, etc.? +* Understand gBrowser.contentWindow.document.body.getBoundingClientRect(). Does this leak some fingerprintable information? +* Modify Tor Browser C++ code to allow precise setting of zoom? (Would allow more precise fit of content height in window.) +*/ + /* jshint esnext: true */ // __quantizeBrowserSize(window, xStep, yStep)__. // Ensures that gBrowser width and height are multiples of // xStep and yStep. let quantizeBrowserSize = function (window, xStep, yStep) { +"use strict"; + +// __currentDefaultZoom__. +// The settings of gBrowser.fullZoom used to quantize the content window dimensions, +// except if the user has pressed zoom+ or zoom-. Stateful. +let currentDefaultZoom = 1; + +// ## Utilities + +// Mozilla abbreviations. +let {classes: Cc, interfaces: Ci, results: Cr, Constructor: CC, utils: Cu } = Components; // Use Task.jsm to avoid callback hell. Cu.import("resource://gre/modules/Task.jsm"); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] - .getService(Components.interfaces.nsISupports).wrappedJSObject; + .getService(Ci.nsISupports).wrappedJSObject; + +// __torbuttonBundle__. +// Bundle of localized strings for torbutton UI. +let torbuttonBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties"); + +// Import utility functions +let { bindPrefAndInit, getEnv } = Cu.import("resource://torbutton/modules/utils.js"); + +// __windowUtils(window)__. +// See nsIDOMWindowUtils on MDN. +let windowUtils = window => window.QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils); + +// __isNumber(value)__. +// Returns true iff the value is a number. +let isNumber = x => typeof x === "number"; + +// __sortBy(array, scoreFn)__. +// Returns a copy of the array, sorted from least to best +// according to scoreFn. +let sortBy = function (array, scoreFn) { + let compareFn = (a, b) => scoreFn(a) - scoreFn(b); + return array.slice().sort(compareFn); +}; -// Utility function -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js"); +// __isMac__. +// Constant, set to true if we are using a Mac (Darwin). +let isMac = Services.appinfo.OS === "Darwin"; + +// __isWindows__. +// Constant, set to true if we are using Windows. +let isWindows = Services.appinfo.OS === "WINNT"; + +// __isTilingWindowManager__. +// Constant, set to true if we are using a (known) tiling window +// manager in linux. +let isTilingWindowManager = (function () { + if (isMac || isWindows) return false; + let gdmSession = getEnv("GDMSESSION"); + if (!gdmSession) return false; + let gdmSessionLower = gdmSession.toLowerCase(); + return ["9wm", "alopex", "awesome", "bspwm", "catwm", "dswm", "dwm", + "echinus", "euclid-wm", "frankenwm", "herbstluftwm", "i3", + "i3wm", "ion", "larswm", "monsterwm", "musca", "notion", + "qtile", "ratpoison", "snapwm", "spectrwm", "stumpwm", + "subtle", "tinywm", "ttwm", "wingo", "wmfs", "wmii", "xmonad"] + .filter(x => x.startsWith(gdmSessionLower)).length > 0; +})(); // __largestMultipleLessThan(factor, max)__. // Returns the largest number that is a multiple of factor // and is less or equal to max. let largestMultipleLessThan = function (factor, max) { - return Math.max(1, Math.floor((1 + max) / factor, 1)) * factor; + return Math.max(1, Math.floor(max / factor, 1)) * factor; +}; + +// ## Task.jsm helper functions + +// __sleep(timeMs)__. +// Returns a Promise that sleeps for the specified time interval, +// and returns an Event object of type "wake". +let sleep = function (timeMs) { + return new Promise(function (resolve, reject) { + window.setTimeout(function () { + resolve(new Event("wake")); + }, timeMs); + }); }; // __listen(target, eventType, useCapture, timeoutMs)__. @@ -47,20 +124,201 @@ let listen = function (target, eventType, useCapture, timeoutMs) { }); }; -// __sleep(time_ms)__. -// Returns a Promise that sleeps for the specified time interval, -// and returns an Event object of type "wake". -let sleep = function (timeoutMs) { - return new Promise(function (resolve, reject) { - window.setTimeout(function () { - resolve(new Event("wake")); - }, timeoutMs); - }); +// __listenForTrueResize(window, timeoutMs)__. +// Task.jsm function. Call `yield listenForTrueResize(window)` to +// wait until the window changes its outer dimensions. Ignores +// resize events where window dimensions are unchanged. Returns +// the resize event object. +let listenForTrueResize = function* (window, timeoutMs) { + let [originalWidth, originalHeight] = [window.outerWidth, window.outerHeight], + event, + finishTime = timeoutMs ? Date.now() + timeoutMs : null; + do { + event = yield listen(window, "resize", true, + finishTime ? finishTime - Date.now() : undefined); + } while (event.type === "resize" && + originalWidth === window.outerWidth && + originalHeight === window.outerHeight); + return event; }; -// __isNumber(value)__. -// Returns true iff the value is a number. -let isNumber = x => typeof x === "number"; +// ## Window state queries + +// __trueZoom(window)__. +// Returns the true magnification of the content in the window +// object. (In contrast, the `gBrowser.fullZoom` value is only approximated +// by the display zoom.) +let trueZoom = window => windowUtils(window).screenPixelsPerCSSPixel; + +// __systemZoom__. +// On Windows, if the user sets the DPI to be 125% or 150% (instead of 100%), +// then we get an overall zoom that needs to be accounted for. +let systemZoom = trueZoom(window); + +// __canBeResized(window)__. +// Returns true iff the window is in a state that can +// be resized. Namely, not fullscreen, not maximized, +// and not running in a tiling window manager. +let canBeResized = function (window) { + // Note that window.fullScreen and (window.windowState === window.STATE_FULLSCREEN) + // sometimes disagree, so we only allow resizing when both are false. + return !isTilingWindowManager && + !window.fullScreen && + window.windowState === window.STATE_NORMAL; +}; + +// __isDocked(window)__. +// On Windows and some linux desktops, you can "dock" a window +// at the right or left, so that it is maximized only in height. +// Returns true in this case. (Note we use mozInnerScreenY instead +// of screenY to take into account title bar space sometimes left +// out of outerHeight in certain desktop environments.) +let isDocked = window => ((window.mozInnerScreenY + window.outerHeight) >= + (window.screen.availTop + window.screen.availHeight) && + (window.screenY <= window.screen.availTop)); + +// ## Window appearance + +// __marginToolTip__. +// A constant. The tooltip string shown in the margin. +let marginToolTip = torbuttonBundle.GetStringFromName("torbutton.content_sizer.margin_tooltip"); + +// __updateContainerAppearance(container, on)__. +// Get the color and position of margins correct. +let updateContainerAppearance = function (container, on) { + // Align the browser at top left, so any gray margin will be visible + // at right and bottom. Except in fullscreen, where we have black + // margins and gBrowser in top center, and when using a tiling + // window manager, when we have gray margins and gBrowser in top + // center. + container.align = on ? + (canBeResized(window) ? "start" : "center") + : ""; + container.pack = on ? "start" : ""; + container.tooltipText = on ? marginToolTip : ""; +}; + +// __updateBackground(window)__. +// Sets the margin background to black or dim gray, depending on +// whether the window is full screen. +let updateBackground = function (window) { + window.gBrowser.parentElement.style + .backgroundColor = window.fullScreen ? "Black" : "LightGray"; +}; + +// ## Window Zooming + +// __computeTargetZoom(parentWidth, parentHeight, xStep, yStep, fillHeight)__. +// Given a parent width and height for gBrowser's container, returns the +// desired zoom for the content window. +let computeTargetZoom = function (parentWidth, parentHeight, xStep, yStep, fillHeight) { + if (fillHeight) { + // Return the estimated zoom need to fill the height of the browser. + let h = largestMultipleLessThan(yStep, parentHeight); + return parentHeight / h; + } else { + // Here we attempt to find a zoom with the best fit for the window size that will + // provide a content window with appropriately quantized dimensions. + let w = largestMultipleLessThan(xStep, parentWidth), + h = largestMultipleLessThan(yStep, parentHeight), + parentAspectRatio = parentWidth / parentHeight, + possibilities = [[w, h], + [Math.min(w, w - xStep), h], + [w, Math.min(h - yStep)]], + // Find the [w, h] pair with the closest aspect ratio to the parent window. + score = ([w, h]) => Math.abs(Math.log(w / h / parentAspectRatio)), + [W, H] = sortBy(possibilities, score)[0]; + // Return the estimated zoom. + return Math.min(parentHeight / H, parentWidth / W); + } +}; + +// __updateDimensions(window, xStep, yStep)__. +// Changes the width and height of the gBrowser XUL element to be a multiple of x/yStep. +let updateDimensions = function (window, xStep, yStep) { + // Don't run if window is minimized. + if (window.windowState === window.STATE_MINIMIZED) return; + let gBrowser = window.gBrowser, + container = gBrowser.parentElement; + updateContainerAppearance(container, true); + let parentWidth = container.clientWidth, + parentHeight = container.clientHeight, + longPage = !gBrowser.contentWindow.fullScreen, + targetZoom = (canBeResized(window) && !isDocked(window)) ? + 1 : computeTargetZoom(parentWidth, + parentHeight, xStep, yStep, longPage), + zoomOffset = 1; + for (let i = 0; i < 8; ++i) { + // We set `gBrowser.fullZoom` to 99% of the needed zoom, unless + // it's `1`. That's because the "true zoom" is sometimes larger + // than fullZoom, and we need to ensure the gBrowser width and + // height do not exceed the container size. + gBrowser.fullZoom = (targetZoom === 1 ? 1 : 0.99) * targetZoom * zoomOffset; + currentDefaultZoom = gBrowser.fullZoom; + let zoom = trueZoom(gBrowser.contentWindow) / systemZoom, + targetContentWidth = largestMultipleLessThan(xStep, parentWidth / zoom), + targetContentHeight = largestMultipleLessThan(yStep, parentHeight / zoom), + targetBrowserWidth = Math.round(targetContentWidth * zoom), + targetBrowserHeight = Math.round(targetContentHeight * zoom); + // Because gBrowser is inside a vbox, width and height behave differently. It turns + // out we need to set `gBrowser.width` and `gBrowser.maxHeight`. + gBrowser.width = targetBrowserWidth; + gBrowser.maxHeight = targetBrowserHeight; + // When using Windows DPI != 100%, we can get rounding errors. We'll need + // to try again if we failed to get rounded content width x height. + // Unfortunately, this is not detectable if search bar or dev console is open. + if ((// Some weird sidebar is open, or + gBrowser.clientWidth !== gBrowser.selectedBrowser.clientWidth || + // content width is correct. + gBrowser.contentWindow.innerWidth === targetContentWidth) && + (// Search bar or dev console is open, or + gBrowser.clientHeight !== gBrowser.selectedBrowser.clientHeight || + // content height is correct. + gBrowser.contentWindow.innerHeight === targetContentHeight)) { + logger.eclog(3, + " chromeWin " + window.outerWidth + "x" + window.outerHeight + + " container " + parentWidth + "x" + parentHeight + + " gBrowser.fullZoom " + gBrowser.fullZoom + "X" + + " targetContent " + targetContentWidth + "x" + targetContentHeight + + " zoom " + zoom + "X" + + " targetBrowser " + targetBrowserWidth + "x" + targetBrowserHeight + + " gBrowser " + gBrowser.clientWidth + "x" + gBrowser.clientHeight + + " content " + gBrowser.contentWindow.innerWidth + "x" + gBrowser.contentWindow.innerHeight); + break; + } + zoomOffset *= 1.02; + } +}; + +// __resetZoomOnDomainChanges(gBrowser, on)__. +// If `on` is true, then every time a tab location changes +// to a new domain, the tab's zoom level is set back to the +// "default zoom" level. +let resetZoomOnDomainChanges = (function () { + let tabToDomainMap = new Map(), + onLocationChange = function (browser) { + let lastHost = tabToDomainMap.get(browser), + currentHost = browser && + browser.currentURI && + browser.currentURI.asciiHost; + if (lastHost !== currentHost) { + browser.fullZoom = currentDefaultZoom; + // Record the tab's current domain, so that we + // can see when it changes. + tabToDomainMap.set(browser, currentHost); + } + }, + listener = { onLocationChange : onLocationChange }; + return function (gBrowser, on) { + if (on) { + gBrowser.addTabsProgressListener(listener); + } else { + gBrowser.removeTabsProgressListener(listener); + } + }; +})(); + +// ## Window Resizing // __reshape(window, {left, top, width, height}, timeoutMs)__. // Reshapes the window to rectangle {left, top, width, height} and yields @@ -73,7 +331,10 @@ let reshape = function* (window, {left, top, width, height}, timeoutMs) { h = isNumber(height) ? height : window.outerHeight; // Make sure we are in a new event. yield sleep(0); - if (w !== window.outerWidth || h !== window.outerWidth) { + // Sometimes we get a race condition in linux when maximizing, + // so check again at the last minute that resizing is allowed. + if (!canBeResized(window)) return; + if (w !== window.outerWidth || h !== window.outerHeight) { window.resizeTo(w, h); } if (x !== window.screenX || y !== window.screenY) { @@ -87,27 +348,17 @@ let reshape = function* (window, {left, top, width, height}, timeoutMs) { h !== window.outerHeight) { let timeLeft = finishTime - Date.now(); if (timeLeft <= 0) break; - yield listen(window, "resize", true, timeLeft); + yield listenForTrueResize(window, timeLeft); } }; -// __rebuild(window)__. -// Jog the size of the window slightly, to remind the window manager -// to redraw the window. -let rebuild = function* (window) { - let h = window.outerHeight; - yield reshape(window, {height : (h + 1)}, 300); - yield reshape(window, {height : h}, 300); -}; - // __gaps(window)__. // Deltas between gBrowser and its container. Returns null if there is no gap. let gaps = function (window) { let gBrowser = window.gBrowser, container = gBrowser.parentElement, - deltaWidth = Math.max(0, container.clientWidth - gBrowser.clientWidth - 1), - deltaHeight = Math.max(0, container.clientHeight - gBrowser.clientHeight - 1); - //logger.eclog(3, "gaps " + deltaWidth + "," + deltaHeight); + deltaWidth = Math.max(0, container.clientWidth - gBrowser.clientWidth), + deltaHeight = Math.max(0, container.clientHeight - gBrowser.clientHeight); return (deltaWidth === 0 && deltaHeight === 0) ? null : { deltaWidth : deltaWidth, deltaHeight : deltaHeight }; }; @@ -115,170 +366,142 @@ let gaps = function (window) { // __shrinkwrap(window)__. // Shrinks the window so that it encloses the gBrowser with no gaps. let shrinkwrap = function* (window) { - // Maximized windows in Linux and Windows need to be demaximized first. - if (gaps(window) && - window.windowState === 1 && /* maximized */ - Services.appinfo.OS !== "Darwin") { - if (Services.appinfo.OS !== "WINNT") { - // Linux windows need an extra jolt out of maximized mode. - window.moveBy(1,1); - } - // If window has been maximized, demaximize by shrinking it to - // fit within the available screen area. - yield reshape(window, - {left : window.screen.availLeft + 1, - top : window.screen.availTop + 1, - width : window.screen.availWidth - 2, - height : window.screen.availHeight - 2}, - 500); - } // Figure out what size change we need. - let currentGaps = gaps(window); + let currentGaps = gaps(window), + screenRightEdge = window.screen.availWidth + window.screen.availLeft, + windowRightEdge = window.screenX + window.outerWidth; if (currentGaps) { // Now resize to close the gaps. yield reshape(window, {width : (window.outerWidth - currentGaps.deltaWidth), - height : (window.outerHeight - currentGaps.deltaHeight)}, + // Shrink in height only if we are not docked. + height : !isDocked(window) ? + (window.outerHeight - + currentGaps.deltaHeight) : null, + left : (isDocked(window) && + (windowRightEdge >= screenRightEdge)) ? + (window.screenX + currentGaps.deltaWidth) + : null }, 500); } }; -// __updateContainerAppearance(container, on)__. -// Get the color and position of margins right. -let updateContainerAppearance = function (container, on) { - // Align the browser at top left, so any gray margin will be visible - // at right and bottom. Except in fullscreen, where we have black - // margins and gBrowser in top center. - container.align = on ? (window.fullScreen ? "center" : "start") - : ""; - container.pack = on ? "start" : ""; - container.style.backgroundColor = on ? (window.fullScreen ? "Black" - : "DimGray") - : ""; +// __rebuild(window)__. +// Jog the size of the window slightly, to remind the window manager +// to redraw the window. +let rebuild = function* (window) { + let h = window.outerHeight; + yield reshape(window, {height : (h + 1)}, 300); + yield reshape(window, {height : h}, 300); }; // __fixWindow(window)__. // An async function for Task.jsm. Makes sure the window looks okay // given the quantized browser element. let fixWindow = function* (window) { - updateContainerAppearance(window.gBrowser.parentElement, true); - if (!window.fullScreen) { + if (canBeResized(window)) { yield shrinkwrap(window); - if (Services.appinfo.OS !== "Darwin" && Services.appinfo.OS !== "WINNT") { - // Linux tends to require us to rebuild the window, or we might be - // left with a large useless white area on the screen. - yield rebuild(window); + if (!isMac && !isWindows) { + // Unfortunately, on some linux desktops, + // the window resize fails if the user is still holding on + // to the drag-resize handle. Even more unfortunately, the + // only way to know that the user if finished dragging + // if we detect the mouse cursor inside the window or the + // user presses a key. + // So, after the first mousemove, or keydown event occurs, we + // rebuild the window. + let event = yield Promise.race( + [listen(window, "mousemove", true), + listen(window, "keydown", true), + listen(window, "resize", true)]); + if (event !== "resize") { + yield rebuild(window); + } + return event; } } }; // __autoresize(window, stepMs)__. -// Do what it takes to eliminate the gray margin around the gBrowser inside -// window. Periodically (stepMs) attempt to shrink the window. Runs -// as a Task.jsm coroutine. -let autoresize = function (window, stepMs) { +// Automatically resize the gBrowser, and then shrink the window +// if the user has attempted to resize it. +let autoresize = function (window, stepMs, xStep, yStep) { let stop = false; Task.spawn(function* () { + // Fix the content dimensions once at startup, and + // keep updating the dimensions whenever the user resizes + // the window. while (!stop) { + updateDimensions(window, xStep, yStep); + let event = yield fixWindow(window); // Do nothing until the user starts to resize window. - let event = yield listen(window, "resize", true); - // Here we wrestle with the window size. If the user has released the - // mouse cursor on the window's drag/resize handle, then fixWindow - // will resize the window on its first call. Unfortunately, on some - // OSs, the window resize fails if the user is still holding on - // to the drag-resize handle. Even more unfortunately, the - // only way to know that the user no longer has the mouse down - // on the window's drag/resize handle is if we detect the mouse - // cursor inside the window. So until the window fires a mousemove - // event, we repeatedly call fixWindow every stepMs. - while (event.type !== "mousemove") { - event = yield Promise.race( - [listen(window, "resize", true, stepMs), - listen(window, "mousemove", true, stepMs)]); - // If the user has stopped resizing the window after `stepMs`, then we can resize - // the window so no gray margin is visible. - if (event.type === "timeout" || event.type === "mousemove") { - yield fixWindow(window); + if ((!event || event.type !== "resize") && !stop) { + event = yield listenForTrueResize(window); + } + if (!isTilingWindowManager) { + while (event.type !== "timeout" && !stop) { + if (!stop) { + updateDimensions(window, xStep, yStep); + event = yield listenForTrueResize(window, stepMs); + } } } + // The user has likely released the mouse cursor on the window's + // drag/resize handle, so loop and call fixWindow. } }); return () => { stop = true; }; }; -// __updateDimensions(gBrowser, xStep, yStep)__. -// Changes the width and height of the gBrowser XUL element to be a multiple of x/yStep. -let updateDimensions = function (gBrowser, xStep, yStep) { - // TODO: Get zooming to work such that it doesn't cause the window - // to continuously shrink. - // We'll use something like: - // let winUtils = gBrowser.contentWindow - // .QueryInterface(Components.interfaces.nsIInterfaceRequestor) - // .getInterface(Components.interfaces.nsIDOMWindowUtils), - // zoom = winUtils.screenPixelsPerCSSPixel, - let zoom = 1, - parentWidth = gBrowser.parentElement.clientWidth, - parentHeight = gBrowser.parentElement.clientHeight, - targetContentWidth = largestMultipleLessThan(xStep, parentWidth / zoom), - targetContentHeight = largestMultipleLessThan(yStep, parentHeight / zoom), - targetBrowserWidth = targetContentWidth * zoom, - targetBrowserHeight = targetContentHeight * zoom; - // Because gBrowser is inside a vbox, width and height behave differently. It turns - // out we need to set `gBrowser.width` and `gBrowser.maxHeight`. - gBrowser.width = targetBrowserWidth; - gBrowser.maxHeight = targetBrowserHeight; - // If the content window's innerWidth/innerHeight failed to updated correctly, - // then jog the gBrowser width/height. (With zoom there may also be a rounding - // error, but we can't do much about that.) - if (gBrowser.contentWindow.innerWidth !== targetContentWidth || - gBrowser.contentWindow.innerHeight !== targetContentHeight) { - gBrowser.width = targetBrowserWidth + 1; - gBrowser.maxHeight = gBrowser.targetBrowserHeight + 1; - gBrowser.width = targetBrowserWidth; - gBrowser.maxHeight = targetBrowserHeight; - } - logger.eclog(3, "zoom " + zoom + "X" + - " chromeWin " + window.outerWidth + "x" + window.outerHeight + - " container " + parentWidth + "x" + parentHeight + - " gBrowser " + gBrowser.clientWidth + "x" + gBrowser.clientHeight + - " content " + gBrowser.contentWindow.innerWidth + "x" + gBrowser.contentWindow.innerHeight); -}; +// ## Main Function -// __quantizeBrowserSizeNow(window, xStep, yStep)__. +// __quantizeBrowserSizeMain(window, xStep, yStep)__. // Ensures that gBrowser width and height are multiples of xStep and yStep, and always as // large as possible inside the chrome window. let quantizeBrowserSizeMain = function (window, xStep, yStep) { let gBrowser = window.gBrowser, container = window.gBrowser.parentElement, - updater = event => updateDimensions(gBrowser, xStep, yStep), - originalMinWidth = gBrowser.minWidth, - originalMinHeight = gBrowser.minHeight, + fullscreenHandler = function () { + // Use setTimeout to make sure we only update dimensions after + // full screen mode is fully established. + window.setTimeout(function () { + updateDimensions(window, xStep, yStep); + updateBackground(window); + }, 0); + }, + originalMinWidth = container.minWidth, + originalMinHeight = container.minHeight, stopAutoresizing, activate = function (on) { + console.log("activate:", on); // Don't let the browser shrink below a single xStep x yStep size. - gBrowser.minWidth = on ? xStep : originalMinWidth; - gBrowser.minHeight = on ? yStep : originalMinHeight; + container.minWidth = on ? xStep : originalMinWidth; + container.minHeight = on ? yStep : originalMinHeight; updateContainerAppearance(container, on); + updateBackground(window); + resetZoomOnDomainChanges(gBrowser, on); if (on) { - // Quantize browser size on activation. - updateDimensions(gBrowser, xStep, yStep); shrinkwrap(window); - // Quantize browser size at subsequent resize events. - window.addEventListener("resize", updater, false); - stopAutoresizing = autoresize(window, 250); + window.addEventListener("sizemodechange", fullscreenHandler, false); + stopAutoresizing = autoresize(window, + (isMac || isWindows) ? 250 : 500, + xStep, yStep); + console.log("activated"); } else { if (stopAutoresizing) stopAutoresizing(); // Ignore future resize events. - window.removeEventListener("resize", updater, false); + window.removeEventListener("sizemodechange", fullscreenHandler, false); // Let gBrowser expand with its parent vbox. gBrowser.width = ""; gBrowser.maxHeight = ""; + console.log("deactivated"); } }; - bindPrefAndInit("extensions.torbutton.resize_windows", activate); + let unbind = bindPrefAndInit("extensions.torbutton.resize_windows", activate); + window.addEventListener("unload", unbind, true); }; quantizeBrowserSizeMain(window, xStep, yStep); -// quantizeBrowserSize +// end of quantizeBrowserSize definition }; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c580c59..3454613 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -644,8 +644,6 @@ function torbutton_init() { createTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); - quantizeBrowserSize(window, 200, 100); - torbutton_log(3, 'init completed'); } @@ -3000,8 +2998,8 @@ function torbutton_new_tab(event) // Returns true if the window wind is neither maximized, full screen, // ratpoisioned/evilwmed, nor minimized. function torbutton_is_windowed(wind) { - torbutton_log(3, "Window: ("+wind.outerHeight+","+wind.outerWidth+") ?= (" - +wind.screen.availHeight+","+wind.screen.availWidth+")"); + torbutton_log(3, "Window: (" + wind.outerWidth + "," + wind.outerHeight + ") ?= (" + + wind.screen.availWidth + "," + wind.screen.availHeight + ")"); if(wind.windowState == Components.interfaces.nsIDOMChromeWindow.STATE_MINIMIZED || wind.windowState == Components.interfaces.nsIDOMChromeWindow.STATE_MAXIMIZED) { torbutton_log(2, "Window is minimized/maximized"); @@ -3391,7 +3389,8 @@ var torbutton_resizelistener = var progress = Components.classes["@mozilla.org/docloaderservice;1"]. getService(Components.interfaces.nsIWebProgress); - var win = getBrowser().contentWindow; + var win = getBrowser().contentWindow, + container = getBrowser().parentElement; if (!win || typeof(win) == "undefined") { torbutton_log(5, "No initial browser content window?"); progress.removeProgressListener(this); @@ -3416,8 +3415,8 @@ var torbutton_resizelistener = " Available: " + availWidth.value + "x" + availHeight.value); - var diff_height = window.outerHeight - win.innerHeight; var diff_width = window.outerWidth - win.innerWidth; + var diff_height = window.outerHeight - win.innerHeight; var delta_fix = 0; // The following block tries to cope with funny corner cases where the @@ -3481,6 +3480,14 @@ var torbutton_resizelistener = height = Math.floor(maxHeight/100.0)*100; } + let resizeInnerWindowTo = function (width, height) { + window.resizeBy(width - win.innerWidth, + height - win.innerHeight); + torbutton_log(3, "Resized new window from: " + container.clientWidth + "x" + + container.clientHeight + " to " + width + "x" + height + + " in state " + window.windowState); + } + m_tb_resize_handler = function() { if (window.windowState === 1) { if (m_tb_prefs. @@ -3537,7 +3544,7 @@ var torbutton_resizelistener = getBoolPref(k_tb_tor_resize_warn_pref)) { window.addEventListener("resize", function() { - win.resizeBy(width - win.innerWidth, height - win.innerHeight); + resizeInnerWindowTo(width, height); var calling_function = arguments.callee; setTimeout(function() { torbutton_log(3, "Removing resize listener.."); @@ -3575,10 +3582,7 @@ var torbutton_resizelistener = // This is fun. any attempt to directly set the inner window actually // resizes the outer width to that value instead. Must use resizeBy() // instead of assignment or resizeTo() - win.resizeBy(width - win.innerWidth, height - win.innerHeight); - torbutton_log(3, "Resized new window from: " + win.innerWidth + "x" + - win.innerHeight + " to " + width + "x" + height + - " in state " + window.windowState); + resizeInnerWindowTo(width, height); // Resizing within this progress listener does not always work as overlays // of other extensions might still influence the height/width of the @@ -3592,14 +3596,9 @@ var torbutton_resizelistener = function(mutations) { mutations.forEach( function(mutation) { - torbutton_log(3, "Mutation observer: Window dimensions are: " + - win.innerWidth + " x " + win.innerHeight); setTimeout(function() { - win.resizeBy(width - win.innerWidth, - height - win.innerHeight); - torbutton_log(3, "Mutation observer: Window " + - "dimensions are (after resizing again): " + win. - innerWidth + " x " + win.innerHeight); + resizeInnerWindowTo(width, height); + quantizeBrowserSize(window, 100, 100); }, 0); mut_observer.disconnect(); } diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index ca048df..76c0c0d 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -7,6 +7,7 @@ torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = relay torbutton.circuit_display.tor_bridge = Bridge torbutton.circuit_display.unknown_country = Unknown country +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 = Click to enable Tor torbutton.panel.tooltip.enabled = Click to disable Tor torbutton.panel.plugins.disabled = Click to enable plugins diff --git a/src/modules/utils.js b/src/modules/utils.js index 7a27326..de3cca6 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -39,5 +39,18 @@ let bindPrefAndInit = function (prefName, prefHandler) { return () => { prefs.removeObserver(prefName, observer); }; }; +// ## Environment variables + +// __env__. +// Provides access to process environment variables. +let env = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + +// __getEnv(name)__. +// Reads the environment variable of the given name. +let getEnv = function (name) { + return env.exists(name) ? env.get(name) : undefined; +}; + // Export utility functions for external use. -let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue"]; +let EXPORTED_SYMBOLS = ["bindPrefAndInit", "getPrefValue", "getEnv"];

1 0

[torbutton/master] Bug 14429: Enable auto-resizing; disable maximization warning.
by mikeperry＠torproject.org 09 May '15

09 May '15

commit 9690abf00de1dbc09fe070b72007a2fca3e6270c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri May 8 19:48:57 2015 -0700 Bug 14429: Enable auto-resizing; disable maximization warning. --- 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 68c4f60..4d1dee0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -118,7 +118,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: @@ -159,7 +159,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

[tor-browser-bundle/master] Update update-responses for 4.5.1.
by mikeperry＠torproject.org 08 May '15

08 May '15

commit e589948e77390f9187b23213ebfec1897c69fc51 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 20:19:36 2015 -0700 Update update-responses for 4.5.1. --- tools/update-responses/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 8c6110d..12f5aa8 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,15 +9,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5 - release: 4.5 + alpha: 4.5.1 + release: 4.5.1 versions: - 4.5: - platformVersion: 31.6.0 + 4.5.1: + platformVersion: 31.7.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5 + download_url: https://www.torproject.org/dist/torbrowser/4.5.1 incremental_from: - - 4.5a5 + - 4.5 - 4.0.8 migrate_archs: osx32: osx64

1 0

[tor-browser-bundle/master] Add changelog entry and bump versions for 4.5.1.
by mikeperry＠torproject.org 08 May '15

08 May '15

commit 4d051e179688e18f78f2d8db0e7dd47f72079f6d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 18:52:52 2015 -0700 Add changelog entry and bump versions for 4.5.1. --- Bundle-Data/Docs/ChangeLog.txt | 21 +++++++++++++++++++++ gitian/versions | 10 +++++----- gitian/versions.alpha | 10 +++++----- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ce63883..cf257f0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +Tor Browser 4.5.1 -- May 12 2015 + * All Platforms + * Update Firefox to 31.7.0esr + * Update meek to 0.18 + * Update Tor Launcher to 0.2.7.5 + * Translation updates only + * Update Torbutton to 1.9.2.3 + * Bug 15837: Show descriptions if unchecking custom mode + * Bug 15927: Force update of the NoScript UI when changing security level + * Bug 15915: Hide circuit display if it is disabled. + * Translation updates + * Bug 15945: Disable NoScript's ClearClick protection for now + * Bug 15933: Isolate by base (top-level) domain name instead of FQDN + * Bug 15857: Fix file descriptor leak in updater that caused update failures + * Bug 15899: Fix errors with downloading and displaying PDFs + * Windows + * Bug 15872: Fix meek pluggable transport startup issue with Windows 7 + * Build System + * Bug 15947: Support Ubuntu 14.04 LXC hosts via LXC_EXECUTE=lxc-execute env var + * Bugs 15921+15922: Fix build errors during Mozilla Tryserver builds + Tor Browser 4.5 -- Apr 28 2015 * All Platforms * Update Tor to 0.2.6.7 with additional patches: diff --git a/gitian/versions b/gitian/versions index 0645ff3..3ec62bc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.6.0esr +FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 TOR_TAG=tor-0.2.6.7 -TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.2 +TORLAUNCHER_TAG=0.2.7.5 +TORBUTTON_TAG=1.9.2.3 HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -33,7 +33,7 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 -GITIAN_TAG=tor-browser-builder-3.x-7 +GITIAN_TAG=tor-browser-builder-3.x-8 OPENSSL_VER=1.0.1m GMP_VER=5.1.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index aa6257d..89f8567 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.6.0esr +FIREFOX_VERSION=31.7.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 TOR_TAG=tor-0.2.6.7 -TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.2 +TORLAUNCHER_TAG=0.2.7.5 +TORBUTTON_TAG=1.9.2.3 HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -33,7 +33,7 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 -GITIAN_TAG=tor-browser-builder-3.x-7 +GITIAN_TAG=tor-browser-builder-3.x-8 OPENSSL_VER=1.0.1m GMP_VER=5.1.3

1 0

[gitian-builder/tor-browser-builder-3] Fix issue #63: use lxc-execute instead of lxc-start
by mikeperry＠torproject.org 08 May '15

08 May '15

commit a681029fa1d0727e2082623a7d7c9937e95aa49c Author: Christopher Gurnee <chris(a)gurneeconsulting.net> Date: Thu Sep 4 16:54:05 2014 -0400 Fix issue #63: use lxc-execute instead of lxc-start --- README.md | 8 ++++---- bin/make-base-vm | 2 +- libexec/copy-from-target | 2 +- libexec/copy-to-target | 2 +- libexec/on-target | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0fe7fde..dfe6ded 100644 --- a/README.md +++ b/README.md @@ -138,13 +138,13 @@ TODO: ## LXC tips -`bin/gbuild` runs `lxc-start`, which may require root. If you are in the admin group, you can add the following sudoers line to prevent asking for the password every time: +`bin/gbuild` runs `lxc-execute`, which may require root. If you are in the admin group, you can add the following sudoers line to prevent asking for the password every time: - %admin ALL=NOPASSWD: /usr/bin/lxc-start + %admin ALL=NOPASSWD: /usr/bin/lxc-execute -Recent distributions allow lxc-start to be run by non-priviledged users, so you might be able to rip-out the `sudo` calls in `libexec/*`. +Recent distributions allow lxc-execute to be run by non-priviledged users, so you might be able to rip-out the `sudo` calls in `libexec/*`. -If you have a runaway `lxc-start` command, just use `kill -9` on it. +If you have a runaway `lxc-execute` command, just use `kill -9` on it. The machine configuration requires access to lxcbr0 and assumes that the host address is 10.0.3.1 . If lxc does not configure lxcbr0 on boot, you can do so manually: diff --git a/bin/make-base-vm b/bin/make-base-vm index cc5fe5b..66a3704 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -68,7 +68,7 @@ if [ $ARCH = "amd64" -a $SUITE = "hardy" ]; then FLAVOUR=server fi -addpkg=openssh-server,pciutils,build-essential,git-core,subversion +addpkg=openssh-server,pciutils,build-essential,git-core,subversion,lxc # Remove cron to work around vmbuilder issue when umounting /dev on target removepkg=cron diff --git a/libexec/copy-from-target b/libexec/copy-from-target index 25133c4..a719f77 100755 --- a/libexec/copy-from-target +++ b/libexec/copy-from-target @@ -50,5 +50,5 @@ if [ -z "$USE_LXC" ]; then scp $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -P $VM_SSH_PORT -r $TUSER@localhost:$1 $2 else config-lxc - sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -cf - "$1" | tar -C "$2" -xkf - + sudo lxc-execute -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -cf - "$1" | tar -C "$2" -xkf - fi diff --git a/libexec/copy-to-target b/libexec/copy-to-target index 82c102a..738bfba 100755 --- a/libexec/copy-to-target +++ b/libexec/copy-to-target @@ -50,5 +50,5 @@ if [ -z "$USE_LXC" ]; then tar -h -C `dirname "$1"` -cf - `basename "$1"` | ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost -- tar -C "$2" -xf - else config-lxc - tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-start -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf - + tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-execute -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf - fi diff --git a/libexec/on-target b/libexec/on-target index fe1f2ce..c8d8a48 100755 --- a/libexec/on-target +++ b/libexec/on-target @@ -52,5 +52,5 @@ if [ -z "$USE_LXC" ]; then ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost $* else config-lxc - sudo lxc-start -n gitian -f var/lxc.config -- sudo -u $TUSER $ENV -i -- $* + sudo lxc-execute -n gitian -f var/lxc.config -- sudo -u $TUSER $ENV -i -- $* fi

1 0

[gitian-builder/tor-browser-builder-3] Default back to lxc-start, with option for lxc-execute
by mikeperry＠torproject.org 08 May '15

08 May '15

commit 0c046177c514f63a0f723959e0ef37333fcd9f71 Author: Devrandom <c1.devrandom(a)niftybox.net> Date: Mon Sep 22 15:10:33 2014 -0700 Default back to lxc-start, with option for lxc-execute --- README.md | 11 ++++++++--- RELEASE_NOTES | 9 +++++++++ libexec/copy-from-target | 2 +- libexec/copy-to-target | 2 +- libexec/gconfig | 3 +++ libexec/on-target | 2 +- 6 files changed, 23 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dfe6ded..2f07c6a 100644 --- a/README.md +++ b/README.md @@ -138,13 +138,18 @@ TODO: ## LXC tips -`bin/gbuild` runs `lxc-execute`, which may require root. If you are in the admin group, you can add the following sudoers line to prevent asking for the password every time: +`bin/gbuild` runs `lxc-execute` or `lxc-start`, which may require root. If you are in the admin group, you can add the following sudoers line to prevent asking for the password every time: %admin ALL=NOPASSWD: /usr/bin/lxc-execute + %admin ALL=NOPASSWD: /usr/bin/lxc-start -Recent distributions allow lxc-execute to be run by non-priviledged users, so you might be able to rip-out the `sudo` calls in `libexec/*`. +Right now `lxc-start` is the default, but you can force `lxc-execute` (useful for Ubuntu 14.04) with: -If you have a runaway `lxc-execute` command, just use `kill -9` on it. + export LXC_EXECUTE=lxc-execute + +Recent distributions allow lxc-execute / lxc-start to be run by non-priviledged users, so you might be able to rip-out the `sudo` calls in `libexec/*`. + +If you have a runaway `lxc-start` command, just use `kill -9` on it. The machine configuration requires access to lxcbr0 and assumes that the host address is 10.0.3.1 . If lxc does not configure lxcbr0 on boot, you can do so manually: diff --git a/RELEASE_NOTES b/RELEASE_NOTES new file mode 100644 index 0000000..514cfdc --- /dev/null +++ b/RELEASE_NOTES @@ -0,0 +1,9 @@ +Important: + +We are planning on switching from using lxc-start to using lxc-execute. lxc-execute requires lxc-init (or init.lxc) to be available on the guest at one of the expected places. You might have to manually install lxc on your base VM image or recreate the image. + +To enable this now (required for Ubuntu 14.04), do: + + export LXC_EXECUTE=lxc-execute + +If your guest is more recent than the host, all bets are off, since lxc-execute may not be able to find the lxc init. diff --git a/libexec/copy-from-target b/libexec/copy-from-target index a719f77..f82da66 100755 --- a/libexec/copy-from-target +++ b/libexec/copy-from-target @@ -50,5 +50,5 @@ if [ -z "$USE_LXC" ]; then scp $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -P $VM_SSH_PORT -r $TUSER@localhost:$1 $2 else config-lxc - sudo lxc-execute -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -cf - "$1" | tar -C "$2" -xkf - + sudo $LXC_EXECUTE -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -cf - "$1" | tar -C "$2" -xkf - fi diff --git a/libexec/copy-to-target b/libexec/copy-to-target index 738bfba..f9d900e 100755 --- a/libexec/copy-to-target +++ b/libexec/copy-to-target @@ -50,5 +50,5 @@ if [ -z "$USE_LXC" ]; then tar -h -C `dirname "$1"` -cf - `basename "$1"` | ssh $QUIET_FLAG -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost -- tar -C "$2" -xf - else config-lxc - tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo lxc-execute -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf - + tar -h -C `dirname "$1"` -cf - `basename "$1"` | sudo $LXC_EXECUTE -n gitian -f var/lxc.config -- sudo -i -u $TUSER tar -C "$2" -xf - fi diff --git a/libexec/gconfig b/libexec/gconfig index ee8baa7..fa69055 100644 --- a/libexec/gconfig +++ b/libexec/gconfig @@ -1 +1,4 @@ VM_SSH_PORT=2223 +if [ -z "$LXC_EXECUTE" ]; then + LXC_EXECUTE=lxc-start +fi diff --git a/libexec/on-target b/libexec/on-target index c8d8a48..ae653bd 100755 --- a/libexec/on-target +++ b/libexec/on-target @@ -52,5 +52,5 @@ if [ -z "$USE_LXC" ]; then ssh -oConnectTimeout=30 -oNoHostAuthenticationForLocalhost=yes -i ${GITIAN_BASE:-.}/var/id_dsa -p $VM_SSH_PORT $TUSER@localhost $* else config-lxc - sudo lxc-execute -n gitian -f var/lxc.config -- sudo -u $TUSER $ENV -i -- $* + sudo $LXC_EXECUTE -n gitian -f var/lxc.config -- sudo -u $TUSER $ENV -i -- $* fi

1 0

[tor-launcher/master] Update translations.
by mikeperry＠torproject.org 08 May '15

08 May '15

commit 79bbdee37d9f67611d39f12aee6da33ae6a76dfa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 18:32:27 2015 -0700 Update translations. --- src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/fr/network-settings.dtd | 2 +- src/chrome/locale/hr/network-settings.dtd | 4 ++-- src/chrome/locale/hr/progress.dtd | 6 +++--- src/chrome/locale/hr/torlauncher.properties | 2 +- src/chrome/locale/tr/progress.dtd | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 7bf1ca5..b817d3c 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Configuració de la Xarxa Tor"> +<!ENTITY torsettings.dialog.title "Configuració de la Tor Network">  diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 877dc1a..0ca1938 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "Non"> <!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation ?"> -<!ENTITY torSettings.configurePrompt1 "Le connexion internet de cet ordinateur est bloqué ou utilise un proxy."> +<!ENTITY torSettings.configurePrompt1 "Le connexion internet de cet ordinateur est restreinte (censurée) ou passe par un proxy."> <!ENTITY torSettings.configurePrompt2 "Je dois configurer le pont réseau ou les paramètres du proxy."> <!ENTITY torSettings.configure "Configurer"> <!ENTITY torSettings.connectPrompt2 "Je souhaite me connecter directement au réseau Tor."> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 62e0093..8ccec3b 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -7,10 +7,10 @@ <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Što od sljedećeg najbolje opisuje tvoju situaciju?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> -<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.configure "Konfiguriraj"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> <!ENTITY torSettings.connect "Poveži se"> diff --git a/src/chrome/locale/hr/progress.dtd b/src/chrome/locale/hr/progress.dtd index 53ba19a..9c3caaf 100644 --- a/src/chrome/locale/hr/progress.dtd +++ b/src/chrome/locale/hr/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> +<!ENTITY torprogress.dialog.title "Status Tor-a"> <!ENTITY torprogress.openSettings "Otvori Postavke"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.heading "Spajanje na Tor mrežu"> +<!ENTITY torprogress.pleaseWait "Molimo pričekajte dok uspostavimo konekciju sa Tor mrežom."> diff --git a/src/chrome/locale/hr/torlauncher.properties b/src/chrome/locale/hr/torlauncher.properties index 0d1c26a..fd08f79 100644 --- a/src/chrome/locale/hr/torlauncher.properties +++ b/src/chrome/locale/hr/torlauncher.properties @@ -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=Spajanje na Tor mrežu torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/tr/progress.dtd b/src/chrome/locale/tr/progress.dtd index b17bf4b..05fa310 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 "Biz Tor ağı ile bağlantı kurana kadar lütfen bekleyin."> +<!ENTITY torprogress.pleaseWait "Tor ağı ile bağlantı kurana kadar lütfen bekleyin.">

1 0

[torbutton/master] Update translations.
by mikeperry＠torproject.org 08 May '15

08 May '15

commit c042622c3d93683f7005ee11b86ecfee92e47957 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 18:32:20 2015 -0700 Update translations. --- src/chrome/locale/fr/torbutton.dtd | 4 ++-- src/chrome/locale/nl/torbutton.properties | 4 ++-- src/chrome/locale/pl/torbutton.properties | 6 +++--- src/chrome/locale/tr/aboutTor.dtd | 2 +- src/chrome/locale/tr/torbutton.dtd | 2 +- src/chrome/locale/tr/torbutton.properties | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index ad6f07a..fa0a532 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -161,8 +161,8 @@ <!ENTITY torbutton.prefs.sec_html5_desc "Les vidéos et médias audio HTML5 deviennent jouable d'un clic via NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Sur quelques sites, vous pourriez devoir utiliser le bouton de barre d'outils de NoScript pour permettre ces objets médiatiques."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Quelques optimisations de performance liés à Javascript sont désactivées."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "JIT ION, Inférence de types, ASM.JS."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT Baseline."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur quelques sites peuvent fonctionner plus lentement."> <!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers distants JAR sont bloqués."> <!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrêmement rares sur le Web, mais peuvent être une source d'attaques XSS et autres."> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 5beed1e..9031caf 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anoni torbutton.popup.never_ask_again = Vraag me dit nooit meer. torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = Het groene ui menu heeft nu een schuif regelaar waar u uw veiligheids level aan kunt passen. Bekijk het eens! torbutton.slider_notification_button = Open de beveiligingsvoorkeuren -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Het maximeren van Tor Browser stelt web paginas in de staat de grote van uw monitor vast te stellen en dat kan gebruik worden om u te tracken. Wij raden aan om het Tor Browser venster in zijn originele staat de laten. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=De website (%S) heeft geprobeerd HTML5 canvas image data op te vragen, wat kan gebruikt worden voor een unieke identificatie van je computer.\n\nMoet Tor Browser deze website toestaan om HTML5 canvas image data op te vragen? diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 4846677..e5b398c 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogą szkodzić Twojej torbutton.popup.never_ask_again = Nie pytaj mnie więcej torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i karty. Wszystkie sesje zostaną utracone.\n\nCzy chcesz zrestartować Tor Browser teraz, aby zmienić tożsamość?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Zielone menu w kształcie cebuli ma suwak który pozwoli wybrać poziom bezpieczeństwa. Sprawdź i wypróbuj! +torbutton.slider_notification_button = Otwórz ustawienia bezpieczeństwa -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Zwiększenie przeglądarki Tor pozwala stronom internetowym ustalić rozmiar ekranu i przez to śledzić użytkownika. Polecamy zostawiać przeglądarka Tor w domyślnym rozmiarze. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ta strona internetowa (%S) próbowała wydobyć HTML5 canvas danych obrazu, które mogą być wykorzystane w celu identyfikacji Twojego komputera.\n\nCzy chcesz, aby Tor Browser pozwolił tej stronie na wydobycie danych obrazu HTML5 canvas? diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index e14481c..56a3fd4 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "AMA, 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'a tıklayın ve ardından Tor Tarayıcı Güncellemesini Denetle seçin."> +<!ENTITY aboutTor.outOfDate2.label "Soğan simgesine tıklayın ve ardından Tor Tarayıcı Güncellemesini Denetle'yi seçin."> <!ENTITY aboutTor.check.label "Tor Ağ Ayarlarını Test Edin"> diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index d574801..fc67df3 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -1,7 +1,7 @@ <!ENTITY torbutton.prefs.title "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'i 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.proxy.host.http "HTTP Vekil Sunucusu:"> diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index b42c784..827c600 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -25,9 +25,9 @@ torbutton.popup.test.confirm_toggle = En son Tor vekil sunucu testi Tor kullanı 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? -torbutton.prefs.recommended = (tavsiye edilir) +torbutton.prefs.recommended = (önerilir) torbutton.prefs.optional = (isteğe bağlı) -torbutton.prefs.crucial = (önemli) +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 @@ -36,7 +36,7 @@ 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 Captchas'ı atla +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

1 0

[torbutton/master] Update changelog and bump version for 1.9.2.3.
by mikeperry＠torproject.org 08 May '15

08 May '15

commit fdb85074153e87151dbd4231eba9fa04e07bf733 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 18:28:49 2015 -0700 Update changelog and bump version for 1.9.2.3. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 9ec02ae..d78bab0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.2.3: + * Bug 15837: Show descriptions if unchecking custom mode + * Bug 15927: Force update of the NoScript UI when changing security level + * Bug 15915: Hide circuit display if it is disabled. + 1.9.2.2: * Bug 15795: Some security slider prefs do not trigger custom checkbox diff --git a/src/install.rdf b/src/install.rdf index 90d12b3..dffaba7 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.2.2</em:version> + <em:version>1.9.2.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/tor-browser-31.6.0esr-4.5-1] fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit bc811be8123e800330a0a39805646169bd61b5f5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 7 13:13:13 2015 -0700 fixup! Bug #5742: API allows you to get the url bar URI for a channel or nsIDocument. Bug 15933: Isolate by base (top-level) domain name instead of FQDN. TLD isolation is needed for file hosting sites, and sites with lots of subdomains. --- content/base/src/ThirdPartyUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 0e037d1..8d76022 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -601,7 +601,7 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, return NS_ERROR_INVALID_ARG; if (!SchemeIsWhiteListed(aFirstPartyURI)) { - nsresult rv = aFirstPartyURI->GetHost(aHost); + nsresult rv = GetBaseDomain(aFirstPartyURI, aHost); return (aHost.Length() > 0) ? NS_OK : rv; }

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 07 May '15

07 May '15

commit df5c4bffa70cce25c6ae66cf362c4b4c4b1853d0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu May 7 12:59:04 2015 -0700 fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- 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 4e7a795..aa7d6df 100644 --- a/browser/extensions/pdfjs/content/PdfStreamConverter.jsm +++ b/browser/extensions/pdfjs/content/PdfStreamConverter.jsm @@ -248,6 +248,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); @@ -255,7 +261,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

[torbutton/master] Bug 15837: Show descriptions if unchecking custom mode
by gk＠torproject.org 07 May '15

07 May '15

commit d1ed854445b313c8539351820785981cda2bd37d Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 7 11:09:51 2015 +0000 Bug 15837: Show descriptions if unchecking custom mode --- src/chrome/content/preferences.xul | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index d25fba4..dfc0f2e 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -297,8 +297,12 @@ </vbox> </hbox> <hbox> +  <checkbox id="torbutton_sec_custom" flex="1" - label="&torbutton.prefs.sec_custom;"/> + oncommand="torbutton_set_slider_text(document, event.target.checked);" + label="&torbutton.prefs.sec_custom;"/> </hbox> </groupbox> </vbox>

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit f259a80f3ee5a51e9826cdd1979d19a1f3943897 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 4 16:55:15 2015 +0200 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. Remove unused variables proxyHost and proxyPort to fix unused-but-set-variable build errors. --- netwerk/base/src/nsSocketTransport2.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/netwerk/base/src/nsSocketTransport2.cpp b/netwerk/base/src/nsSocketTransport2.cpp index baa14da..658f2e0 100644 --- a/netwerk/base/src/nsSocketTransport2.cpp +++ b/netwerk/base/src/nsSocketTransport2.cpp @@ -1080,8 +1080,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us const char *host = mHost.get(); int32_t port = (int32_t) mPort; - const char *proxyHost = mProxyHost.IsEmpty() ? nullptr : mProxyHost.get(); - int32_t proxyPort = (int32_t) mProxyPort; uint32_t proxyFlags = 0; nsCOMPtr<nsIProxyInfo> proxyInfo = mProxyInfo; @@ -1154,8 +1152,6 @@ nsSocketTransport::BuildSocket(PRFileDesc *&fd, bool &proxyTransparent, bool &us // since socks is transparent, any layers above // it do not have to worry about proxy stuff proxyInfo = nullptr; - proxyHost = nullptr; - proxyPort = -1; proxyTransparent = true; } }

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit 3b7305457124de7d7fee52d3bd3e3fa1ca5f62e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon May 4 18:30:06 2015 +0200 fixup! Bug #3455.1: Allow proxy settings to be set per URL bar domain. Fix reorder build error: ../../../dist/include/mozilla/net/HttpBaseChannel.h:339:11: error: 'mozilla::net::HttpBaseChannel::mRedirectCount' will be initialized after [-Werror=reorder] ../../../dist/include/mozilla/net/HttpBaseChannel.h:327:20: error: 'nsCOMPtr<nsIURI> mozilla::net::HttpBaseChannel::mProxyURI' [-Werror=reorder] /builds/slave/try-l64-d-00000000000000000000/build/src/netwerk/protocol/http/HttpBaseChannel.cpp:39:1: error: when initialized here [-Werror=reorder] --- netwerk/protocol/http/HttpBaseChannel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 64b202a..17f8c72 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -65,10 +65,10 @@ HttpBaseChannel::HttpBaseChannel() , mAllRedirectsSameOrigin(true) , mSuspendCount(0) , mProxyResolveFlags(0) + , mProxyURI(nullptr) , mContentDispositionHint(UINT32_MAX) , mHttpHandler(gHttpHandler) , mRedirectCount(0) - , mProxyURI(nullptr) { LOG(("Creating HttpBaseChannel @%x\n", this));

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug 15857: Fix file descriptor leak in updater.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit a8348a29adac38d64625fce35baba7684fef3fcd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 6 20:11:40 2015 -0700 Bug 15857: Fix file descriptor leak in updater. Corresponds to Mozilla bug https://bugzilla.mozilla.org/show_bug.cgi?id=1159826. --- toolkit/mozapps/update/updater/updater.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 3ba92b3..89f12ec 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -799,7 +799,7 @@ static int ensure_copy_recursive(const NS_tchar *path, const NS_tchar *dest, } } } - + NS_tclosedir(dir); return rv; }

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15899' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 07 May '15

07 May '15

commit 31c6bfb7ef8eb79fe526ceaece91d6236f8cdd8a Merge: 3006aa5 15bf754 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 6 19:42:54 2015 -0700 Merge remote-tracking branch 'arthur/15899' into tor-browser-31.6.0esr-4.5-1 browser/extensions/pdfjs/content/build/pdf.worker.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 07 May '15

07 May '15

commit 15bf754badd65bccc1ea898324392a4d34a8e97e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri May 1 14:49:58 2015 -0700 fixup! Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- browser/extensions/pdfjs/content/build/pdf.worker.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/browser/extensions/pdfjs/content/build/pdf.worker.js b/browser/extensions/pdfjs/content/build/pdf.worker.js index a8779ab..805cc66 100644 --- a/browser/extensions/pdfjs/content/build/pdf.worker.js +++ b/browser/extensions/pdfjs/content/build/pdf.worker.js @@ -1048,7 +1048,14 @@ PDFJS.createObjectURL = (function createObjectURLClosure() { if (!PDFJS.disableCreateObjectURL && typeof URL !== 'undefined' && URL.createObjectURL) { var blob = PDFJS.createBlob(data, contentType); - return URL.createObjectURL(blob); + try { + return URL.createObjectURL(blob); + } catch(e) { + // URL.createObjectURL has thrown an error; continue to + // data schema fallback. + // TODO: Remove this try-catch when we re-enable + // createObjectURL in workers. + } } var buffer = 'data:' + contentType + ';base64,';

1 0

[tor-browser-bundle/master] Bug 15945: Disable NoScript's ClearClick protection for now.
by mikeperry＠torproject.org 07 May '15

07 May '15

commit a9619e0a54d7c134325ad5a9496ffc67d07b0dcf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 6 18:56:45 2015 -0700 Bug 15945: Disable NoScript's ClearClick protection for now. Bug #14985 has analysis toward a more complete fix for enabling it. --- .../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 d1469a8..7a95619 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 @@ -61,3 +61,4 @@ pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); +pref("noscript.clearClick", 0); 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 d1469a8..7a95619 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 @@ -61,3 +61,4 @@ pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); +pref("noscript.clearClick", 0); 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 fb2141b..976d71c 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 @@ -61,3 +61,4 @@ pref("noscript.cascadePermissions", true); pref("noscript.restrictSubdocScripting", true); pref("noscript.showVolatilePrivatePermissionsToggle", false); pref("noscript.volatilePrivatePermissions", true); +pref("noscript.clearClick", 0);

1 0

[torbutton/master] Bug 15927: Force update of the NoScript UI
by gk＠torproject.org 06 May '15

06 May '15

commit fecc621d6c3928918b4c62071f41ac2e4287e121 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 5 00:22:15 2015 -0700 Bug 15927: Force update of the NoScript UI --- src/chrome/content/torbutton.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 21e567e..c580c59 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2378,6 +2378,22 @@ function torbutton_update_security_slider() { } break; } + /* Update the NoScript button to reflect any changes */ + try { + let wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + let browserEnumerator = wm.getEnumerator("navigator:browser"); + + // Update every window's NoScript status... + while (browserEnumerator.hasMoreElements()) { + let win = browserEnumerator.getNext(); + win.noscriptOverlay._syncUINow(); + } + torbutton_log(3, 'Updated NoScript status for security slider'); + } catch(e) { + torbutton_log(4, 'Failed to update NoScript status for security slider: '+e); + } + torbutton_log(3, 'Security Slider Pref Update Complete'); m_tb_sliderUpdate = false; }

1 0

[torbutton/master] Bug 15915: Hide circuit display if it is disabled.
by gk＠torproject.org 04 May '15

04 May '15

commit fc05d63ab7f01fabf999960d31a9795349054a7b Author: anonym <anonym(a)riseup.net> Date: Mon May 4 11:04:29 2015 +0200 Bug 15915: Hide circuit display if it is disabled. If extensions.torbutton.display_circuit = false from the start, then myController will never be set, so when we call stop() we won't call syncDisplayWithSelectedTab(false) to hide the circuit display. --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 4197944..2da7f0a 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -315,8 +315,8 @@ let setupDisplay = function (host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stop = function() { + syncDisplayWithSelectedTab(false); if (myController) { - syncDisplayWithSelectedTab(false); if (stopCollectingIsolationData) { stopCollectingIsolationData(); }

1 0

[tor-browser-bundle/master] Update meek to 0.18.
by gk＠torproject.org 04 May '15

04 May '15

commit 0db1987644292794b35b0681c27ec175f372861b Author: David Fifield <david(a)bamsoftware.com> Date: Fri May 1 04:01:28 2015 +0000 Update meek to 0.18. This undoes a regression related to TOR_PT_EXIT_ON_STDIN_CLOSE that broke meek on Windows 7. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index 26b116b..0645ff3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -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.17 +MEEK_TAG=0.18 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 86e163d..aa6257d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -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.17 +MEEK_TAG=0.18 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index 854e422..0341c4e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -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.17 +MEEK_TAG=0.18 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug 12827: Create preference to disable SVG.
by mikeperry＠torproject.org 24 Apr '15

24 Apr '15

commit 3006aa548cefa2f9d0968c978786dcefa9309119 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 24 10:40:44 2015 -0400 fixup! Bug 12827: Create preference to disable SVG. During parsing, avoid dereferencing null pointers when script and style elements are created as generic elements (i.e., when svg.in-content.enabled=false). Fixes ticket #15794. --- parser/html/nsHtml5TreeOperation.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp index 7ad65247..b9f1768 100644 --- a/parser/html/nsHtml5TreeOperation.cpp +++ b/parser/html/nsHtml5TreeOperation.cpp @@ -607,8 +607,8 @@ void nsHtml5TreeOperation::PreventScriptExecution(nsIContent* aNode) { nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(aNode); - MOZ_ASSERT(sele); - sele->PreventExecution(); + if (sele) + sele->PreventExecution(); } void @@ -827,14 +827,18 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder, case eTreeOpSetStyleLineNumber: { nsIContent* node = *(mOne.node); nsCOMPtr<nsIStyleSheetLinkingElement> ssle = do_QueryInterface(node); - NS_ASSERTION(ssle, "Node didn't QI to style."); + if (!ssle) + return NS_ERROR_DOM_NOT_SUPPORTED_ERR; + ssle->SetLineNumber(mFour.integer); return NS_OK; } case eTreeOpSetScriptLineNumberAndFreeze: { nsIContent* node = *(mOne.node); nsCOMPtr<nsIScriptElement> sele = do_QueryInterface(node); - NS_ASSERTION(sele, "Node didn't QI to script."); + if (!sele) + return NS_ERROR_DOM_NOT_SUPPORTED_ERR; + sele->SetScriptLineNumber(mFour.integer); sele->FreezeUriAsyncDefer(); return NS_OK;

1 0

[tor-browser-bundle/master] Update changelog and versions
by gk＠torproject.org 24 Apr '15

24 Apr '15

commit 3e6e3159c90cdfe33c38ed698d702ec97fcf49cc Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 24 18:26:16 2015 +0000 Update changelog and versions --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ee17952..ce63883 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,7 +3,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Update Tor to 0.2.6.7 with additional patches: * Bug 15482: Reset timestamp_dirty each time a SOCKSAuth circuit is used * Update NoScript to 2.6.9.22 - * Update HTTPS-Everywhere to 5.0.2 + * Update HTTPS-Everywhere to 5.0.3 * Bug 15689: Resume building HTTPS-Everywhere from git tags * Update meek to 0.17 * Update obfs4proxy to 0.0.5 @@ -12,18 +12,20 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked * Bug 13576: Don't strip "bridge" from the middle of bridge lines * Bug 15657: Display the host:port of any connection faiures in bootstrap - * Update Torbutton to 1.9.2.1 + * Update Torbutton to 1.9.2.2 * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults * Bug 15510: Close Tor Circuit UI control port connections on New Identity * Bug 15472: Make node text black in circuit status UI * Bug 15502: Wipe blob URIs on New Identity + * Bug 15795: Some security slider prefs do not trigger custom checkbox * Bug 14429: Disable automatic window resizing for now * Bug 4100: Raise HTTP Keep-Alive back to 115 second default * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bugs 14716+13254: Fix issues with HTTP Auth usage and TLS connection info display * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access + * Bug 15794: Crash on some pages with SVG images if SVG is disabled * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions * Bug 15758: Disable Device Sensor APIs diff --git a/gitian/versions b/gitian/versions index d490333..26b116b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.1 -HTTPSE_TAG=5.0.2 +TORBUTTON_TAG=1.9.2.2 +HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 7f323be..86e163d 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,11 +8,11 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.1 -HTTPSE_TAG=5.0.2 +TORBUTTON_TAG=1.9.2.2 +HTTPSE_TAG=5.0.3 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[torbutton/master] Update changelog and bump version
by gk＠torproject.org 24 Apr '15

24 Apr '15

commit 827995a19f49894cc0e49ed96d11ac716dd51e90 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 24 18:02:13 2015 +0000 Update changelog and bump version --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4a3353d..9ec02ae 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.2: + * Bug 15795: Some security slider prefs do not trigger custom checkbox + 1.9.2.1: * Bug 14429: Disable window resizing for now. diff --git a/src/install.rdf b/src/install.rdf index 6af4e9b..90d12b3 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.2.0</em:version> + <em:version>1.9.2.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] Bug 15795: Some security slider prefs do not trigger custom checkbox.
by gk＠torproject.org 24 Apr '15

24 Apr '15

commit cacd8c67be59359b2a9bdf8a2cf2a341401cc77e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 24 11:34:54 2015 -0400 Bug 15795: Some security slider prefs do not trigger custom checkbox. Also monitor the following prefs. so that all manual changes cause the security slider's "custom" checkbox to be toggled: mathml.disabled network.jar.block-remote-files svg.in-content.enabled --- src/chrome/content/torbutton.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7d229dd..21e567e 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -122,11 +122,14 @@ var torbutton_unique_pref_observer = this._branch.addObserver("extensions.torbutton", this, false); this._branch.addObserver("network.proxy", this, false); this._branch.addObserver("network.cookie", this, false); + this._branch.addObserver("network.jar", this, false); this._branch.addObserver("browser.privatebrowsing.autostart", this, false); this._branch.addObserver("javascript", this, false); this._branch.addObserver("gfx", this, false); this._branch.addObserver("noscript", this, false); this._branch.addObserver("media", this, false); + this._branch.addObserver("mathml", this, false); + this._branch.addObserver("svg", this, false); // We observe xpcom-category-entry-added for plugins w/ Gecko-Content-Viewers var observerService = Cc["@mozilla.org/observer-service;1"]. @@ -140,11 +143,14 @@ var torbutton_unique_pref_observer = this._branch.removeObserver("extensions.torbutton", this); this._branch.removeObserver("network.proxy", this); this._branch.removeObserver("network.cookie", this); + this._branch.removeObserver("network.jar", this); this._branch.removeObserver("browser.privatebrowsing.autostart", this); this._branch.removeObserver("javascript", this); this._branch.removeObserver("gfx", this); this._branch.removeObserver("noscript", this); this._branch.removeObserver("media", this); + this._branch.removeObserver("mathml", this); + this._branch.removeObserver("svg", this); var observerService = Cc["@mozilla.org/observer-service;1"]. getService(Ci.nsIObserverService); @@ -244,6 +250,7 @@ var torbutton_unique_pref_observer = case "gfx.font_rendering.graphite.enabled": case "noscript.globalHttpsWhitelist": case "noscript.global": + case "svg.in-content.enabled": // |m_tb_slider_update| is only set if the user updated a // preference under control of the security slider via the // slider on the Torbutton dialog. This in turn means we can

1 0

[tor-browser-bundle/master] Update the updater config file
by gk＠torproject.org 22 Apr '15

22 Apr '15

commit e3cc7044dbec5ff8fd834c06bf486da03c9dc311 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 22 20:28:49 2015 +0000 Update the updater config file --- tools/update-responses/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1475195..8c6110d 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,6 +10,7 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 4.5 + release: 4.5 versions: 4.5: platformVersion: 31.6.0 @@ -17,6 +18,7 @@ versions: download_url: https://www.torproject.org/dist/torbrowser/4.5 incremental_from: - 4.5a5 + - 4.0.8 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/master] Update Changelog
by gk＠torproject.org 22 Apr '15

22 Apr '15

commit 7f6d8de86e51dfff1fafa5bebc888496bf80a2f6 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 22 08:17:04 2015 +0000 Update Changelog --- Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5233f60..ee17952 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -12,7 +12,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 11879: Stop bootstrap if Cancel or Open Settings is clicked * Bug 13576: Don't strip "bridge" from the middle of bridge lines * Bug 15657: Display the host:port of any connection faiures in bootstrap - * Update Torbutton to 1.9.2.0 + * Update Torbutton to 1.9.2.1 * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults * Bug 15510: Close Tor Circuit UI control port connections on New Identity @@ -22,7 +22,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 4100: Raise HTTP Keep-Alive back to 115 second default * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism - * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display + * Bugs 14716+13254: Fix issues with HTTP Auth usage and TLS connection info display * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions

1 0

[tor-browser-bundle/master] Update Torbutton to 1.9.2.1
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit fa486aff85025ed4a3022a39025ba1a10269126b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 22 00:59:01 2015 -0700 Update Torbutton to 1.9.2.1 --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions | 2 +- gitian/versions.alpha | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7e4b01c..5233f60 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -18,6 +18,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 15510: Close Tor Circuit UI control port connections on New Identity * Bug 15472: Make node text black in circuit status UI * Bug 15502: Wipe blob URIs on New Identity + * Bug 14429: Disable automatic window resizing for now * Bug 4100: Raise HTTP Keep-Alive back to 115 second default * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism diff --git a/gitian/versions b/gitian/versions index 653b4b1..d490333 100755 --- a/gitian/versions +++ b/gitian/versions @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.0 +TORBUTTON_TAG=1.9.2.1 HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6419111..7f323be 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 TOR_TAG=tor-0.2.6.7 TORLAUNCHER_TAG=0.2.7.4 -TORBUTTON_TAG=1.9.2.0 +TORBUTTON_TAG=1.9.2.1 HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Bug 14429: Disable resizing for now.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 0e20a8156e86111281e4d8a0684b753056e52ea7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 22 00:56:55 2015 -0700 Bug 14429: Disable resizing for now. --- src/defaults/preferences/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 85fd953..68c4f60 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -159,7 +159,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] Update changelog for 1.9.2.1.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit d215393de112d742c5d88336a71bc7a4dab8e4f5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 22 00:57:47 2015 -0700 Update changelog for 1.9.2.1. --- src/CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index e50f5b6..4a3353d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.9.2.1: + * Bug 14429: Disable window resizing for now. + 1.9.2.0: * Bug 15562: Bind SharedWorkers to thirdparty pref * Bug 15533: Restore default security level when restoring defaults

1 0

[tor-browser-bundle/master] Update versions files (alpha and stable) for 4.5.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 750efb38def19147d1c363ceb8738920784f0b48 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 20:02:26 2015 -0700 Update versions files (alpha and stable) for 4.5. --- gitian/versions | 29 +++++++++++++++++------------ gitian/versions.alpha | 12 ++++++------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gitian/versions b/gitian/versions index 3b74f27..653b4b1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.2.0esr +FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3 -TOR_TAG=tor-0.2.5.10 -TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.7.0.1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TOR_TAG=tor-0.2.6.7 +TORLAUNCHER_TAG=0.2.7.4 +TORBUTTON_TAG=1.9.2.0 HTTPSE_TAG=5.0.2 -NSIS_TAG=v0.2 +NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ??? +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: ??? PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 @@ -27,13 +27,18 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=0.2 MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 +GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de +GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd +GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 +GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 +OBFS4_TAG=obfs4proxy-0.0.5 GITIAN_TAG=tor-browser-builder-3.x-7 -OPENSSL_VER=1.0.1i +OPENSSL_VER=1.0.1m GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5 @@ -52,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.3-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -74,12 +79,12 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 +OPENSSL_HASH=095f0b7b09116c0c5526422088058dc7e6e000aa14d22acca6a4e2babcdfef74 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a +NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 718019b..6419111 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 -TOR_TAG=tor-0.2.6.6 -TORLAUNCHER_TAG=0.2.7.3 -TORBUTTON_TAG=1.9.1.0 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build2 +TOR_TAG=tor-0.2.6.7 +TORLAUNCHER_TAG=0.2.7.4 +TORBUTTON_TAG=1.9.2.0 HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 @@ -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.19-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.22-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=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -84,7 +84,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad +NOSCRIPT_HASH=0c6774cd5479a315253eb403c6a7c074658154630ac9c4bc481aa0aba6eb16a8 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] List 4.5 in update-responses for alpha users.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 4ac8af0dccc5e63fbfe44ca7deb98db019ba5a80 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 20:02:49 2015 -0700 List 4.5 in update-responses for alpha users. --- 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 d06be81..1475195 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,14 +9,14 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 4.5a5 + alpha: 4.5 versions: - 4.5a5: + 4.5: platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.5a5 + download_url: https://www.torproject.org/dist/torbrowser/4.5 incremental_from: - - 4.5a4 + - 4.5a5 migrate_archs: osx32: osx64 osx32:

1 0

[torbutton/master] Import translations.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 6530c29c248f035050dc978018230e3df83243dd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:55:55 2015 -0700 Import translations. --- src/chrome/locale/ar/torbutton.properties | 2 +- src/chrome/locale/de/torbutton.dtd | 4 +- src/chrome/locale/de/torbutton.properties | 4 +- src/chrome/locale/es/torbutton.properties | 2 +- src/chrome/locale/eu/aboutTor.dtd | 2 +- src/chrome/locale/eu/torbutton.dtd | 8 ++-- src/chrome/locale/eu/torbutton.properties | 2 +- src/chrome/locale/fa/torbutton.properties | 4 +- src/chrome/locale/fr/torbutton.dtd | 34 ++++++++--------- src/chrome/locale/fr/torbutton.properties | 6 +-- src/chrome/locale/it/torbutton.properties | 12 +++--- src/chrome/locale/ja/torbutton.properties | 2 +- src/chrome/locale/ko/torbutton.properties | 2 +- src/chrome/locale/nl/torbutton.dtd | 30 +++++++-------- src/chrome/locale/nl/torbutton.properties | 2 +- src/chrome/locale/pl/torbutton.properties | 2 +- src/chrome/locale/pt/torbutton.properties | 2 +- src/chrome/locale/ru/torbutton.dtd | 50 ++++++++++++------------- src/chrome/locale/ru/torbutton.properties | 18 ++++----- src/chrome/locale/sv/torbutton.dtd | 52 +++++++++++++------------- src/chrome/locale/sv/torbutton.properties | 14 +++---- src/chrome/locale/tr/torbutton.properties | 6 +-- src/chrome/locale/vi/torbutton.properties | 2 +- src/chrome/locale/zh-CN/aboutTor.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 18 ++++----- src/chrome/locale/zh-CN/torbutton.properties | 22 +++++------ 26 files changed, 152 insertions(+), 152 deletions(-) diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index 456399a..ef6dd71 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = البرامج الإضافية مثل فلا torbutton.popup.never_ask_again = لا تسألني مرة اخري torbutton.popup.confirm_newnym = متصفح تور -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 622cfc1..dbf16ac 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -163,8 +163,8 @@ <!ENTITY torbutton.prefs.sec_some_jit_desc "Einige JavaScript Ausführungsoptimierungen sind unterbunden."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Typinferenz, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "JIT-Basis."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen seiten langsamer laufen."> -<!ENTITY torbutton.prefs.sec_jar_desc "JAR-Dateieen sind im Web extrem selten, können aaber eine Quelle von XSS und anderen Attacken sein."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts können auf manchen Seiten langsamer laufen."> +<!ENTITY torbutton.prefs.sec_jar_desc "JAR-Dateien sind im Web extrem selten, können aber eine Quelle von XSS und anderen Attacken sein."> <!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-Dateien sind sehr selten im Internet, aber sie können eine Quelle von XSS (Webseitenübergreifendes Skripting) und anderer Angriffe sein."> <!ENTITY torbutton.prefs.sec_mathml_desc "Manche Vorgänge zur Anzeige von mathematischen Gleichungen sind deaktiviert."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML ist blockiert."> diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index ed2941d..53bc747 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph torbutton.popup.never_ask_again = Nicht mehr nachfragen torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um Ihre Identität zurückzusetzen?\n\n -torbutton.slider_notification = Das grüne Onion Menü hat jetzt einen Sicherheits-Regler welches Ihr Sicherheits-Level einstellt. Probier's aus! +torbutton.slider_notification = Das grüne Onion-Menü hat jetzt einen Sicherheitsschieberegler, mit dem Sie Ihre Sicherheitsstufe anpassen können. Probieren Sie es aus! torbutton.slider_notification_button = Öffne Sicherheits-Einstellungen -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Die Maximierung des Tor-Browsers kann Webseiten die Bestimmung Ihrer Bildschirmgröße ermöglichen, um damit Ihre Spur zu verfolgen. Wir empfehlen Ihnen, das Tor-Browser-Fenster in seiner ursprünglichen Standardgröße zu belassen. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Die Internetseite (%S) hat versucht, HTML5-Canvas-Bilddaten zu extrahieren, die verwendet werden können, um Ihren Rechner eindeutig zu identifizieren. \n\nSoll Tor-Browser es dieser Internetseite erlauben HTML5-Canvas-Bilddaten zu extrahieren? diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 6edea41..3812a7a 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Complementos (plugins) como Flash pueden daña torbutton.popup.never_ask_again = No volver a preguntar torbutton.popup.confirm_newnym = El Navegador Tor cerrará todas las ventanas y pestañas. Todas las sesiones de sitios web se perderán.\n\n¿Reiniciar el Navegador Tor para restablecer su identidad?\n\n -torbutton.slider_notification = El menú de la cebolla verde incluye ahora un panel deslizante que le permite ajustar el nivel de seguridad. ¡Pruébelo! +torbutton.slider_notification = El menú de la cebolla verde ahora tiene un control deslizante que le permite ajustar su nivel de seguridad. ¡Échele un vistazo! torbutton.slider_notification_button = Abrir ajustes de seguridad torbutton.maximize_warning = Maximizar el navegador Tor puede permitir a los sitios web determinar el tamaño de su monitor, lo que se puede usar para rastrearle. Le recomendamos que deje las ventanas del navegador Tor a su tamaño predeterminado original. diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 692e1d1..03bf31d 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "HALA ERE, nabigatzaile hau zaharkituta dago."> <!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu"> <!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 0511ec4..9bb8698 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -24,19 +24,19 @@ <!ENTITY torbutton.pref_connection_more_info.text "Une honetan Torbutton gaituta dago. Zure ez-Tor proxy ezarpenak aldatu nahi badituzu, mesedez ezgaitu Torbutton eta hona bueltatu. Zure Tor ezarpenak aldatu nahi badituzu, mesedez erabili Torbutton ezarpen leihoa."> <!ENTITY torbutton.context_menu.new_identity "Nortasun berria"> <!ENTITY torbutton.context_menu.new_identity_key "I"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "Tor zirkuitu berria gune honetarako"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Aldatu Toren egoera"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "Pribatutasun eta segurtasun ezarpenak..."> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Torbuttoni buruz..."> <!ENTITY torbutton.context_menu.about.key "A"> <!ENTITY torbutton.context_menu.networksettings "Tor Sarearen Ezarpenak..."> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "Tor Browser eguneraketa egiaztatu"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie babesak..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Kopiatu Tor URLa"> <!ENTITY torbutton.context_menu.copyTor.key "p"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index 671940d..ae01c49 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta torbutton.popup.never_ask_again = Ez nazazu galdetu berriz torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 2a4b86e..e19af7f 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = پلاگینها مانند فلش، میتو torbutton.popup.never_ask_again = دیگر هیچگاه این را از من نپرس torbutton.popup.confirm_newnym = مرورگر Tor همه پنجره ها و تب ها را می بندد. همه جلسات وب سایت شود از دست خواهد رفت\n\nآیا می خواهید راه اندازی مجدد مرورگر Tor الان انجام شود تا هویت خود را تنظیم مجدد کنید؟\n -torbutton.slider_notification = منوی پیاز سبز در حال حاضر یک نوار لغزنده امنیتی که به شما اجازه می دهد سطح امنیتی خود را تنظیم کنید. آن را چک کنید! +torbutton.slider_notification = منوی پیاز سبز در حال حاضر یک نوار لغزنده امنیتی است که به شما اجازه می دهد سطح امنیتی خود را تنظیم کنید. آن را چک کنید! torbutton.slider_notification_button = باز کردن تنظیمات امنیتی -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = ماکسیمایز کردن مرورگر تُر به وبسایت ها این امکان را می دهد که از روی سایز صفحه نمایش، شما را ردگیری کنند. پیشنهاد می کنیم که از سایز پیش فرض مرورگر تُر استفاده کنید. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=این وب‌سایت (%S) سعی دارد اطلاعات بوم تصویر HTML5 را دریافت کند که ممکن است برای شناسایی منحصر به فرد کامپیوتر شما استفاده شود.\n\nآیا مرورگر تور میبایست اجازه دریافت این اطلاعات را بدهد؟ diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index f972f41..ad6f07a 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -157,31 +157,31 @@ <!ENTITY torbutton.prefs.sec_low_desc "A ce niveau de sécurité, toutes les fonctions de navigation sont activés."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme SVG OpenType de rendu des polices est désactivé."> <!ENTITY torbutton.prefs.sec_med_low "Moyen-Bas"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants s'appliquent (passez la souris au dessus pour afficher des détails) :"> +<!ENTITY torbutton.prefs.sec_html5_desc "Les vidéos et médias audio HTML5 deviennent jouable d'un clic via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Sur quelques sites, vous pourriez devoir utiliser le bouton de barre d'outils de NoScript pour permettre ces objets médiatiques."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Quelques optimisations de performance liés à Javascript sont désactivées."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Les scripts sur quelques sites peuvent fonctionner plus lentement."> +<!ENTITY torbutton.prefs.sec_jar_desc "Les fichiers distants JAR sont bloqués."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "Les fichiers JAR sont extrêmement rares sur le Web, mais peuvent être une source d'attaques XSS et autres."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Quelques mécanismes d'affichage d'équations mathématiques sont désactivés."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML est désactivé."> <!ENTITY torbutton.prefs.sec_med_high "Moyen-Haut"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Toutes les optimisations de performance de Javascript sont désactivées."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Certaines fonctionnalités de rendu de police sont désactivées."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Le mécanisme de rendu de police de caractères Graphite est désactivé."> +<!ENTITY torbutton.prefs.sec_svg_desc "Quelques types d'images sont désactivés."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "Les images SVG sont désactivées."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript est désactivé par défaut sur tous les sites non-HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript peut être activé selon le site via le bouton de barre d'outils NoScript."> <!ENTITY torbutton.prefs.sec_high "Haut"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript est désactivé par défaut sur tous les sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "La plupart des formats audio et vidéo sont désactivés."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM est le seul codec qui reste permis."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Certaines polices de caractères et icônes peuvent être affichées de façon incorrecte."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Les fichiers de police de caractères fournis par des sites Web sont bloqués."> <!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisées"> <!ENTITY torbutton.circuit_display.title "Circuit Tor pour ce site"> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index bb5a6ae..c6a109e 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à v torbutton.popup.never_ask_again = Ne plus me poser la question. torbutton.popup.confirm_newnym = Le navigateur Tor va fermer toutes les fenêtres et onglets. Tous les sessions ouvertes seront perdues.\n\nVoulez-vous redémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Le menu de l'oignon vert a maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez le ! +torbutton.slider_notification_button = Ouvrir préférences de sécurité -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Ce site (%S) tente d'extraire des informations d'image canvas HTML5 qui pourraient être utilisées comme identifiant unique pour votre ordinateur.\n\nTor Browser doit-il autoriser le site à extraire les informations d'image canvas HTML5 ? diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index e3929a4..9187d15 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -53,15 +53,15 @@ torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorb torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tua privacy e anonimità.\n\nPossono anche eludere Tor per rivelare la tua posizione attuale e il tuo indirizzo IP.\n\nSei sicuro di volere attivare i plugin?\n torbutton.popup.never_ask_again = Non chiedermelo più -torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sezioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n +torbutton.popup.confirm_newnym = Tor Browser chiuderà tutte le schede e finestre. Tutte le sessioni dei siti andranno perse.\n\nRiavviare ora Tor Browser per azzerare la tua identità?\n\n torbutton.slider_notification = Il menù della cipolla verde ha ora una slider di sicurezza che ti permette di regolare il livello di sicurezza. Dai un'occhiata! torbutton.slider_notification_button = Apri impostazioni sicurezza -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Massimizzando Tor Browser, i siti web possono risalire alle dimensioni del tuo schermo, e questo può servire a rintracciarti. Ti raccomandiamo di mantenere invariate le dimensioni iniziali di default delle finestre di Tor Browser. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Questo sito (%S) tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito? +canvas.siteprompt=Questo sito (%S) ha tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito? canvas.notNow=Non ora canvas.notNowAccessKey=N canvas.allow=acconsenti in futuro @@ -72,6 +72,6 @@ canvas.neverAccessKey=e # Profile/startup error messages. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S is the application name. profileProblemTitle=Problema Profilo %S -profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un altra posizione prima di usarlo. -profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S nel tuo desktop o nella cartella Applicazioni prima di usarlo. -profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, controlla i permessi del tuo file system e riprova. +profileReadOnly=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S in un'altra posizione prima di usarlo. +profileReadOnlyMac=Non puoi avviare %S da un file system di sola lettura. Per favore copia %S sulla tua scrivania o nella cartella Applicazioni prima di usarlo. +profileAccessDenied=%S non ha i permessi per accedere al profilo. Per favore, modifica i permessi del tuo file system e riprova. diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 133ad88..fe40735 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Flashなどのプラグインはあなたの torbutton.popup.never_ask_again = 次からはたずねない torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index df9ddbf..1c3bf03 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = 플래시와 같은 플러그인들은 당신 torbutton.popup.never_ask_again = 다시는 물어보지 않기 torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index b9209b4..365da9e 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -153,34 +153,34 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Dit verschaft de meest bruikbare ervaring"> +<!ENTITY torbutton.prefs.sec_low_desc "Op dit beveiligingsniveau worden alle browser functies ingeschakeld."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "De SVG OpenType font rendering mechanisme is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_med_low "Medium-Laag"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "Op dit veiligheidsniveau , gelden de volgende wijzigingen ( muis over voor meer informatie) "> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video en audio media geworden click-to-play via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites , zou je de NoScript werkbalk knop moeten gebruiken om deze media -objecten mogelijk te maken."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript performance optimizations zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts kunnen op sommige websites trager zijn."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> +<!ENTITY torbutton.prefs.sec_jar_desc "Externe JAR bestanden worden geblokkeerd."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-bestanden zijn uiterst zeldzaam op het web, maar kan een bron van XSS en andere attacks"> +<!ENTITY torbutton.prefs.sec_mathml_desc "Sommige mechanismen van het weergeven van wiskundige vergelijkingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_med_high "Medium-Hoog"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Alle JavaScript performance optimizations zijn uitgeschakeld."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Sommige lettertype rendering functies zijn uitgeschakeld."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "De Graphite lettertype rendering mechanisme is uitgeschakeld."> <!ENTITY torbutton.prefs.sec_svg_desc "Sommige afbeeldingtypes zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG afbeeldingen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is standaard uitgeschakeld op alle niet-HTTPS websites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan worden ingeschakeld op een basis per - site via de NoScript werkbalk knop."> <!ENTITY torbutton.prefs.sec_high "Hoog"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is standaard uitgeschakeld op alle websites."> <!ENTITY torbutton.prefs.sec_audio_video_desc "Meeste audio en video formaten zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM blijft de enige codec die is ingeschakeld."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Sommige lettertypen en pictogrammen worden mogelijk niet goed weergegeven. "> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Door websites aangeleverde lettertypes worden geblokkeerd."> <!ENTITY torbutton.prefs.sec_custom "Aangepaste waarden"> <!ENTITY torbutton.circuit_display.title "Tor circuit voor deze website"> diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 3ed9ef3..5beed1e 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = plug-ins zoals flash kunnen u privacy en anoni torbutton.popup.never_ask_again = Vraag me dit nooit meer. torbutton.popup.confirm_newnym = De Tor Browser zal alle windows en tabs sluiten. Alle website sessies zullen verloren gaan.\n\nHerstart de Tor Browser om je identiteit te resetten?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open de beveiligingsvoorkeuren torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index c04c876..4846677 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Wtyczki takie jak Flash mogą szkodzić Twojej torbutton.popup.never_ask_again = Nie pytaj mnie więcej torbutton.popup.confirm_newnym = Tor Browser zamknie wszystkie otwarte okna i karty. Wszystkie sesje zostaną utracone.\n\nCzy chcesz zrestartować Tor Browser teraz, aby zmienić tożsamość?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index f343a97..787dbd1 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n -torbutton.slider_notification = O menu cebola verde tem agora um cursor de segurança que o deixa ajustar o seu nível de segurança. Dê uma vista de olhos! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Abra as definições de segurança torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 4d472cb..2b0156a 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Наиболее простой вариант использования."> +<!ENTITY torbutton.prefs.sec_low_desc "На этом уровне безопасности, все функции браузера включены."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Механизм визуализации шрифта SVG OpenType отключен."> <!ENTITY torbutton.prefs.sec_med_low "Средний"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "На этом уровне безопасности, следующие изменения применяются (при наведении курсора мыши):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 видео и аудио воспроизводятся только после щелчка благодаря NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "На некоторых сайтах, вам может потребоваться использовать кнопку NoScript панели инструментов, чтобы включить эти мультимедийные объекты."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Некоторые оптимизации производительности JavaScript отключены."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> -<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Базовый JIT."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Сценарии на некоторых сайтах могут работать медленнее."> +<!ENTITY torbutton.prefs.sec_jar_desc "Сторонние JAR файлы заблокированы."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR файлы крайне редки в Интернете, но могут быть источником XSS и других атак."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Некоторые механизмы отображения математических уравнений отключены."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML отключен."> <!ENTITY torbutton.prefs.sec_med_high "Умеренно высокий"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Все оптимизации производительности JavaScript отключены."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Некоторые функции отрисовки шрифтов отключены."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Механизм визуализации шрифта Graphite отключен."> +<!ENTITY torbutton.prefs.sec_svg_desc "Некоторые типы изображений отключены."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG изображения отключены"> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript отключен по умолчанию на всех не HTTPS сайтах."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript может быть включен на сайте с помощью кнопки NoScript на панели инструментов."> <!ENTITY torbutton.prefs.sec_high "Высокий"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript отключен по умолчанию на всех сайтах."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "Большинство аудио и видео форматов отключены."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM является только кодеком, который остается включенным."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Некоторые шрифты и значки могут отображаться некорректно."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Файлы шрифтов, предоставленные сайтом, заблокированы"> <!ENTITY torbutton.prefs.sec_custom "Собственные значения"> <!ENTITY torbutton.circuit_display.title "Цепочка Tor для этого сайта"> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 7e06f17..d70db02 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -2,9 +2,9 @@ torbutton.button.tooltip.disabled = Включить Tor torbutton.button.tooltip.enabled = Отключить Tor torbutton.circuit_display.internet = Интернет torbutton.circuit_display.ip_unknown = IP неизвестен -torbutton.circuit_display.onion_site = Onion site +torbutton.circuit_display.onion_site = "Луковый" сайт torbutton.circuit_display.this_browser = Этот браузер -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = узел torbutton.circuit_display.tor_bridge = Ретранслятор torbutton.circuit_display.unknown_country = Неизвестная страна torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Плагины вроде Flash могут н torbutton.popup.never_ask_again = Больше не спрашивать torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии веб-сайта будут потеряны.\n\nПерезапустить сейчас Tor Browser, чтобы изменить Вашу личность?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Зеленое "луковое" меню имеет бегунок безопасности, который позволяет настраивать уровень безопасности. Оцените его! +torbutton.slider_notification_button = Открыть настройки безопасности -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Открытие браузера Tor на максимальную величину может позволить веб-сайтам определить размер Вашего монитора, чтобы отследить Вас. Мы рекомендуем оставлять окна браузера в их первоначальном размере. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Этот веб-сайт (%S) пытается извлечь данные изображения HTML5 canvas, что может быть использовано для получения информации о вашем компьютере.\n\nДолжен ли Tor Browser разрешить этому сайту извлечь данные изображения HTML5 canvas? @@ -71,7 +71,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 -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. +profileProblemTitle=Проблема с профилем %S +profileReadOnly=Невозможно запустить %S из под системы с файловой системой "только для чтения". Пожалуйста, скопируйте %S в другое место перед использованием. +profileReadOnlyMac=Невозможно запустить %S из файловой системы, доступной только для чтения. Пожалуйста, скопируйте %S на рабочий стол или в папку "Приложения" перед использованием. +profileAccessDenied=У %S нет разрешения на доступ к профилю. Пожалуйста, измените права доступа и попробуйте снова. diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index d4de340..07e8fa5 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -24,7 +24,7 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton är aktiverad. Om du vill ändra inställningar för proxy utan Tor, inaktivera Tor och kom tillbaka hit. Om du vill ändra inställningar för Tor, använd Torbutton-inställningarna."> <!ENTITY torbutton.context_menu.new_identity "Ny identitet"> <!ENTITY torbutton.context_menu.new_identity_key "N"> -<!ENTITY torbutton.context_menu.new_circuit "Ny Tor circuit för den här sajten"> +<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets för den här webbsidan"> <!ENTITY torbutton.context_menu.new_circuit_key "S"> <!ENTITY torbutton.context_menu.toggle "Slå på/av Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> @@ -153,35 +153,35 @@ <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> <!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> <!ENTITY torbutton.prefs.sec_low "Låg (förvald)"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "This provides the most usable experience."> -<!ENTITY torbutton.prefs.sec_low_desc "At this security level, all browser features are enabled."> -<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "The SVG OpenType font rendering mechanism is disabled."> +<!ENTITY torbutton.prefs.sec_low_usable_desc "Detta skapar den mest användbara upplevelsen."> +<!ENTITY torbutton.prefs.sec_low_desc "På den här säkerhetsnivån är webbläsarens alla funktioner aktiverade."> +<!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Användande av SVG OpenType-typsnitt är avaktiverad."> <!ENTITY torbutton.prefs.sec_med_low "Medium-låg"> -<!ENTITY torbutton.prefs.sec_gen_desc "At this security level, the following changes apply (mouseover for details):"> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video and audio media become click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "On some sites, you might need to use the NoScript toolbar button to enable these media objects."> -<!ENTITY torbutton.prefs.sec_some_jit_desc "Some JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_gen_desc "På den här säkerhetsnivån gäller följande förändringar (håll markören över för detaljer):"> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbsidor kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen."> +<!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript är inaktiverade."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> -<!ENTITY torbutton.prefs.sec_jar_desc "Remote JAR files are blocked."> -<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR files are extremely rare on the web, but can be a source of XSS and other attacks."> -<!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> -<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbsidor kan gå långsammare."> +<!ENTITY torbutton.prefs.sec_jar_desc "JAR-filer blockeras."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR-filer är extremt ovanliga på webben men kan innehålla XSS och andra typer av attacker."> +<!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> +<!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> <!ENTITY torbutton.prefs.sec_med_high "Medium-hög"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> -<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc "Some types of images are disabled."> -<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG images are disabled."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript is disabled by default on all non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript can be enabled on a per-site basis via the NoScript toolbar button."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "Alla prestandaoptimeringar av JavaScript är inaktiverade."> +<!ENTITY torbutton.prefs.sec_font_rend_desc "Vissa funktioner för gestaltning av typsnitt är avaktiverad."> +<!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Användande av Graphite-typsnitt är avaktiverad."> +<!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder är inaktiverade."> +<!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder är inaktiverade."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbsidor som inte använder HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbsidor via NoScript-knappen."> <!ENTITY torbutton.prefs.sec_high "Hög"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_audio_video_desc "Most audio and video formats are disabled."> -<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM is the only codec that remains enabled."> -<!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbsidor."> +<!ENTITY torbutton.prefs.sec_audio_video_desc "De flesta ljud- och bildformat är avaktiverade."> +<!ENTITY torbutton.prefs.sec_audio_video_desc_tooltip "WebM är den enda codec som förblir aktiverad."> +<!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> <!ENTITY torbutton.prefs.sec_custom "Anpassad nivå"> -<!ENTITY torbutton.circuit_display.title "Tor circuit för den här sajten"> +<!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbsidan"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 80da57f..6c2d180 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Insticksmoduler så som Flash kan äventyra di torbutton.popup.never_ask_again = Fråga aldrig igen torbutton.popup.confirm_newnym = Tor Browser kommer att stänga alla fönster och flikar. Alla webbplatssessioner kommer att gå förlorade.\n\nStarta om Tor Browser nu för att återställa din identitet?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Den gröna onion menyn har nu en säkerhetsinställning. Kolla in den! +torbutton.slider_notification_button = Öppna säkerhetsinställningar -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = Att maximera Tor Browser kan ge webbsajter möjlighet att upptäcka din monitors storlek, vilket kan användas för att spåra dig. Vi rekommenderar att du lämnar Tor Browser fönstret i dess ursprungliga storlek. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Denna webbsida (%S) försökte komma åt HTML5-bilddata på ett kanvas, som skulle kunna användas för att identifiera just din dator.\n\nSka Tor Browser tillåta den här webbsidan att använda HTML5-bilddata på kanvas? @@ -71,7 +71,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 -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. +profileProblemTitle=%S Profilproblem +profileReadOnly=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till ett annat ställe innan användning. +profileReadOnlyMac=Du kan inte köra %S från ett read-only filsystem. Kopiera först %S till Skrivbordet eller Applications-katalogen innan användning. +profileAccessDenied=%S har inte rättighet att använda profilen. Vänligen ändra dina rättigheter i filsystemet och försök igen! diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index 59dafbd..b42c784 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -55,10 +55,10 @@ torbutton.popup.confirm_plugins = Flash gibi eklentiler gizliliğinizi ve anonim 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.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +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_button = Güvenlik ayarlarını aç -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +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. # 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? diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 9ae81f9..aa129d5 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -55,7 +55,7 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! +torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! torbutton.slider_notification_button = Open security settings torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 5403ed9..dca1bba 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -33,7 +33,7 @@ <!ENTITY aboutTor.torInfo4.label "本服务器不记录有关访问者的任何信息。"> <!ENTITY aboutTor.whatnextQuestion.label "下一步？"> <!ENTITY aboutTor.whatnextAnswer.label "仅仅使用 Tor 无法实现匿名浏览。为了确保身份安全，你可能需要改变某些浏览习惯。"> -<!ENTITY aboutTor.whatnext.label "保持匿名小技巧 »"> +<!ENTITY aboutTor.whatnext.label "匿名提示 »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.helpInfo1.label "你也可以帮忙！"> <!ENTITY aboutTor.helpInfo2.label "可通过很多方式提供帮助，让 Tor 网络变得更快更强大："> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 90076de..76910e8 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -144,26 +144,26 @@ <!ENTITY torbutton.prefs.engine3 "Yahoo.com"> <!ENTITY torbutton.prefs.engine4 "startpage.com"> <!ENTITY torbutton.prefs.engine5 "duckduckgo.com"> -<!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时分割平台和语言信息。"> +<!ENTITY torbutton.prefs.fix_google_srch "在 Google 搜索栏搜索时去掉平台和语言信息。"> <!ENTITY torbutton.prefs.transparentTor "Tor 强化透明代理（需要自设 TransProxy 或 Tor 路由）"> <!ENTITY torbutton.prefs.priv_caption "隐私设置"> <!ENTITY torbutton.prefs.block_disk "禁止记录浏览历史或网站数据（启用隐私浏览模式）"> <!ENTITY torbutton.prefs.restrict_thirdparty "限制第三方 cookie 和其他数据跟踪程序"> <!ENTITY torbutton.prefs.block_plugins "禁用浏览器插件（比如 Flash）"> -<!ENTITY torbutton.prefs.resist_fingerprinting "请修改区别你与其他 Tor 浏览器用户的详细信息"> +<!ENTITY torbutton.prefs.resist_fingerprinting "对相关 Tor 浏览器信息进行修改，以区别你与其他 Tor 用户"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_low "低（默认）"> -<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项提供最具可用性的用户体验。"> +<!ENTITY torbutton.prefs.sec_low_usable_desc "该选项可提供最佳的用户体验。"> <!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低"> -<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别具有以下更改（鼠标悬停可查看细节）："> -<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频媒体通过 NoScript 实现点击播放。"> -<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可使用 NoScript 工具栏按钮来启用这些媒体对象。"> +<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别设置如下（光标悬停查看更多信息）："> +<!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> +<!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站的脚本可能运行更慢。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本执行变慢。"> <!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> <!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。"> @@ -174,8 +174,8 @@ <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "禁用 Graphite 字体渲染。"> <!ENTITY torbutton.prefs.sec_svg_desc "禁用某些图像类型。"> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "禁用 SVG 图像。"> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript 在所有非 HTTPS 网站上被禁用。"> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可按站点通过 NoScript 工具栏按钮上启用 JavaScript。"> +<!ENTITY torbutton.prefs.sec_js_https_desc "对于非 HTTPS 网站，默认禁用 JavaScript。"> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "可通过工具栏上的 NoScript 按钮，启用某个网站上的 JavaScript。"> <!ENTITY torbutton.prefs.sec_high "高"> <!ENTITY torbutton.prefs.sec_all_js_desc "默认禁用所有网站 JavaScript。"> <!ENTITY torbutton.prefs.sec_audio_video_desc "禁用大多数音频和视频格式。"> diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index 7461488..0546132 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -15,12 +15,12 @@ torbutton.panel.label.disabled = Tor 已禁用 torbutton.panel.label.enabled = Tor 已启用 extensions.torbutton(a)torproject.org.description = Torbutton 是一个按钮，可对“Tor 设置”进行修改，并可快速而方便地清除浏览器隐私数据。 torbutton.popup.history.warning = Torbutton 屏蔽了在其他 Tor 状态下加载的标签的活动。\n\n这是用于暂时解决 Firefox Bug 409737 和 417869。\n如果这个弹出窗口在您不知情的情况下弹出，则您的标签之一正试图在后台重新载入自己，然而这样的行为是被屏蔽的。\n\n要刷新当前 Tor 状态下的标签，将焦点置于在地址栏并按回车键。\n\n -torbutton.popup.plugin.warning = Torbutton 阻止了浏览器戴 Tor 时直接加载需要插件支持的内容。\n\n请使用“另存为”(保存后浏览)。\n\n -torbutton.popup.confirm_ca_certs = Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，障碍Tor的切换。您是否希望禁用对CA证书的隔离？)如果您不懂，可以选择“确定”) -torbutton.popup.ff3.warning = 警告！\n\nFirefox 3 会通过 Tor 泄露您的时区及 Livemark (书签栏的RSS链接)，Torbutton 对此无能为力。\n\n您是否要继续？ -torbutton.popup.toggle.warning = 您需要切换 Tor 或重新启动您的设置才会生效。 +torbutton.popup.plugin.warning = Torbutton 阻止通过 Tor 直接加载插件内容。\n\n请使用“另存为”。\n\n +torbutton.popup.confirm_ca_certs = Torbutton 注意：浏览器似乎缺少自定义的CA(证书颁发机构)。检查CA列表是一项耗时的操作，Tor 切换将变慢。是否希望禁用对CA证书的隔离？（如果不明白该问题，可以选择“确定”) +torbutton.popup.ff3.warning = 警告！\n\nFirefox 3 可能通过 Tor 泄露时区及 Livemark (书签栏的RSS链接)。\n\n是否仍要继续操作？ +torbutton.popup.toggle.warning = 为了应用设置，需切换 Tor 或重新启动。 torbutton.popup.test.success = Tor 代理测试成功！ -torbutton.popup.test.failure = Tor 代理测试失败！请检查您的代理和 Polipo 设置。 +torbutton.popup.test.failure = Tor 代理测试失败！请检查代理和 Polipo 设置。 torbutton.popup.test.confirm_toggle = 上一次 Tor 代理测试失败。\n\n您还要启用代理吗？\n\n注意：如果您已经解决了代理问题，请打开 Torbutton 代理设置窗口，消除此警告。 torbutton.popup.test.ff3_notice = 单击“确定”测试 Tor 的代理设置。测试将在后台进行，请耐心等待。 torbutton.panel.label.verified = Tor 验证通过 @@ -41,24 +41,24 @@ torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google Captcha，您 torbutton.popup.captcha.always = 此后总是使用此操作 torbutton.popup.redirect = 重定向 torbutton.popup.no_redirect = 不要重定向 -torbutton.popup.prompted_language = 为了更好地保护您的隐私， Torbutton 可以请求网页的英语版本。这可能导致您希望浏览的本土语言的网页以英语显示。\n\n您要为了更好地保护隐私，以英语语言请求网页吗？ +torbutton.popup.prompted_language = 为了更好地保护隐私， Torbutton 可以请求网页的英语版本。这可能导致您希望浏览的本土语言的网页以英语显示。\n\n为了更好地保护隐私，是否请求网页以英语显示？ torbutton.popup.no_newnym = Torbutton 无法安全地为您切换一个新身份。它无法访问 Tor 的控制端口。\n\n您目前正在使用 Tor 浏览器套件吗？ torbutton.popup.use_tbb = 您似乎正在 Firefox 中使用 Torbutton，而我们不再推荐此配置。\n\n我们推荐您使用最新的 Tor 浏览器套件，您可以发电邮给 gettor(a)torproject.org 获得此套件或从如下链接下载： -torbutton.popup.pref_error = Torbutton 无法更新 Tor 浏览器配置目录中的配置。 +torbutton.popup.pref_error = Torbutton 无法更新 Tor 浏览器配置目录中的首选项。 torbutton.popup.permission_denied = 请重置 Tor 浏览器目录的文件权限或将其复制到一个新位置。 torbutton.popup.device_full = 硬盘空间已满。请释放一些空间或将 Tor 浏览器移动至其他新设备。 torbutton.title.prompt_torbrowser = Torbutton 重要信息 torbutton.popup.prompt_torbrowser = Torbutton 工作方式有所改变：它不再支持临时关闭。\n\n做出这种改变是因为在非匿名浏览的浏览器中，同时使用 Torbutton 并不安全。有太多无法克服的错误。\n\n如果您希望正常使用 Firefox ，请卸载 Torbutton 插件，下载 Tor 浏览器套件。Tor 浏览器的隐私特性优于普通的 Firefox ，即使Firefox中使用了Torbutton。\n\n移除 Torbutton，请到工具Tools->附加组件Addons->扩展Extensions 中，在 Torbutton 旁点击卸载。 -torbutton.popup.short_torbrowser = Torbutton的重要信息！\n\nTorbutton 目前已知处于启用状态。\n\n点击 Torbutton 获取更多信息。 +torbutton.popup.short_torbrowser = Torbutton 重要信息！\n\nTorbutton 目前已知处于启用状态。\n\n点击 Torbutton 获取更多信息。 torbutton.popup.confirm_plugins = Flash 之类的插件可对用户的隐私与匿名性造成危害。\n\n它们还可能绕过 Tor 而泄漏用户的当前位置和 IP 地址。\n\n是否确定启用插件？\n\n torbutton.popup.never_ask_again = 不再询问 -torbutton.popup.confirm_newnym = Tor Browser 将关闭所有窗口和标签页。所有网站登录状态都将丢失。\n\n重新启动 Tor Browser 以重置您的身份？\n\n +torbutton.popup.confirm_newnym = Tor Browser 将关闭全部窗口和标签页。所有网站会话都将丢失。\n\n是否马上重启 Tor Browser 以重置身份标识？\n\n -torbutton.slider_notification = 绿色的洋葱菜单中现在有了一个安全滑块，您可以用它来调整您的安全级别。试试吧！ +torbutton.slider_notification = 绿色的洋葱菜单内置安全滑块，可用以调整安全级别。试试吧！ torbutton.slider_notification_button = 打开安全设置 -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. +torbutton.maximize_warning = 最大化 Tor Browser 窗口之后，网站可获取显示器尺寸信息，从而可跟踪用户。建议使用默认的Tor Browser 窗口大小。 # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=此网站 (%S) 试图获取 HTML5 Canva 图像数据，该数据可用作你所用计算机的唯一标识。\n\nTor Browser 是否应允许此网站获取 HTML5 Canva 图像数据？

1 0

[tor-launcher/master] Update translations.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 1be49192e9d29f2b541f723068c3c7cb986ccbd5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:56:40 2015 -0700 Update translations. --- src/chrome/locale/bg/network-settings.dtd | 6 ++-- src/chrome/locale/ca/network-settings.dtd | 2 +- src/chrome/locale/ca/progress.dtd | 2 +- src/chrome/locale/cs/network-settings.dtd | 8 ++--- src/chrome/locale/eu/network-settings.dtd | 8 ++--- src/chrome/locale/id/network-settings.dtd | 8 ++--- src/chrome/locale/lv/network-settings.dtd | 8 ++--- src/chrome/locale/sr/network-settings.dtd | 2 +- src/chrome/locale/sr(a)latin/network-settings.dtd | 34 ++++++++++----------- src/chrome/locale/sr(a)latin/torlauncher.properties | 4 +-- src/chrome/locale/zh-CN/network-settings.dtd | 4 +-- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 3813505..6b1c255 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -9,7 +9,7 @@ <!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> <!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана или минава през proxy сървър."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Трябва да конфигурирам bridge или proxy настройки."> <!ENTITY torSettings.configure "Конфигурирай"> <!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> <!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> @@ -17,7 +17,7 @@ <!ENTITY torSettings.proxyQuestion "Този компютър използва ли локално прокси за достъп до Интернет?">  -<!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 "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> <!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> <!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> <!ENTITY torSettings.bridgeHelp "Ако не сте сигурни как да отговорите на този въпрос, изберете No.  Ако изберете Yes, вие ще бъдете помолен да конфигурирате Tor Bridges, непубликувани relays които правят блокирането на връзката към Tor Network по трудна."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Необходимо е използването на локален прокси сървър за достъп до Интернет"> <!ENTITY torsettings.useProxy.type "Прокси Тип:"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index a8996f7..7bf1ca5 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Configuració Xarxa Tor"> +<!ENTITY torsettings.dialog.title "Configuració de la Xarxa Tor">  diff --git a/src/chrome/locale/ca/progress.dtd b/src/chrome/locale/ca/progress.dtd index 18b34e0..cb62f1b 100644 --- a/src/chrome/locale/ca/progress.dtd +++ b/src/chrome/locale/ca/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Estat del Tor"> +<!ENTITY torprogress.dialog.title "Estat de Tor"> <!ENTITY torprogress.openSettings "Obrir preferències."> <!ENTITY torprogress.heading "S'està connectant a la xarxa Tor"> <!ENTITY torprogress.pleaseWait "Si us plau, espereu mentre establim una connexió a la xarxa Tor."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index ad8842d..7554d91 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> <!ENTITY torSettings.configurePrompt1 "Připojení k internetu u tohoto pořítače je cenzorováno nebo proxováno."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit most, nebo lokální nastavení proxy."> <!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connectPrompt2 "Chtěl bych se přímo připojit k Tor síti."> <!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Potřebuje tento počítač zapnutí lokální proxy, aby se připojil k 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 "Pokud nevíte, jak odpovědět, podívejte se na nastavení sítě Internet v jiném prohlížeči, abyste zjistili, zda je nakonfigurován k používání proxy."> <!ENTITY torSettings.enterProxy "Zadejte nastavení serveru proxy."> <!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> <!ENTITY torSettings.bridgeHelp "Pokud si nejste jistí jak odpovědět na tuto otázku, zvolte No.  Pokud vyberete Ano, budete vyzváni k nastavení Mostů TORu, což jsou přenašeče neuvedené v seznamu, které dělají blokování spojení se sítí TORu složitější."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Volitelný"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potřebuje použití proxy, aby se připojil k internetu."> <!ENTITY torsettings.useProxy.type "Typ Proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo jméno hosta"> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index c6da9ae..e96f95c 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Hurrengoetako zeinek deskribatzen du zure egoera hobekien?"> <!ENTITY torSettings.configurePrompt1 "Ordenagailu honen Interneteko konexioa zentsuratuta dago edo proxy batetik igarotzen da."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Zubi edo proxy lokalaren ezarpenak konfiguratu behar ditut."> <!ENTITY torSettings.configure "Konfiguratu"> <!ENTITY torSettings.connectPrompt2 "Tor sarera zuzenean konektatu nahiko nuke."> <!ENTITY torSettings.connectPrompt3 "Hau egoera gehienetan funtzionatuko du."> <!ENTITY torSettings.connect "Konektatu"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Ordenagailu honek Internetera sartzeko proxy lokalen bat erabili behar al du?">  -<!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 "Galdera hau nola erantzuteaz zalantzan bazaude, begiratu beste nabigatzaile batean Interneteko ezarpenak proxy lokal bat erabiltzeko konfiguratuta dagoen ikusteko."> <!ENTITY torSettings.enterProxy "Sartu proxy ezarpenak."> <!ENTITY torSettings.bridgeQuestion "Zure Interneteko Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera doazen konexioak blokeatu edo zentsuratu egiten ditu?"> <!ENTITY torSettings.bridgeHelp "Galdera hau nola erantzuteaz ziur ez bazaude, aukeratu Ez.  Bai aukeratzen baduzu, Tor zubiak konfigura ditzazun eskatuko zaizu, hau da zerrendatuta ez dauden eta Tor sarera doazen konexioak blokeatzea zailago egiten duten erreleak."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Hautazkoa"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Ordenagailu honek proxy lokal bat erabili behar du Internetera sartzeko"> <!ENTITY torsettings.useProxy.type "Proxy mota:"> <!ENTITY torsettings.useProxy.address "Helbidea:"> <!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena"> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 428626b..2033052 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Opsional"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Komputer ini perlu menggunakan proxy lokal untuk mengakses internet"> <!ENTITY torsettings.useProxy.type "Tipe Proxy:"> <!ENTITY torsettings.useProxy.address "Alamat:"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host"> @@ -54,9 +54,9 @@ <!ENTITY torsettings.bridgeHelp1 "Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor.   Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir."> <!ENTITY torsettings.bridgeHelp1B "Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini:"> <!ENTITY torsettings.bridgeHelp2Heading "Lewat web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp2 "Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Melalui Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3.emailDesc "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference):"> <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com"> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "Melalui Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index 94ab0a3..a08b592 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -9,15 +9,15 @@ <!ENTITY torSettings.firstQuestion "Kura situācija vislabāk atbilst jūsējai?"> <!ENTITY torSettings.configurePrompt1 "Datora savienojums ar internetu ir cenzēts vai starpniekots."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Man jānokonfigurē tiltu vai lokālo starpniekserveru iestatījumi."> <!ENTITY torSettings.configure "Konfigurēt"> <!ENTITY torSettings.connectPrompt2 "Es vēlos tieši pieslēgties tīklam Tor."> <!ENTITY torSettings.connectPrompt3 "Šis strādās vairumā gadījumu."> <!ENTITY torSettings.connect "Veidot savienojumu"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Vai šim datoram jāizmanto lokālais starpniekserveris, lai piekļūtu internetam?">  -<!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 "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.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."> @@ -30,7 +30,7 @@ <!ENTITY torsettings.optional "Neobligāts"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Šajā datorā interneta piekļuvei ir jāizmanto lokālais starpniekserveris."> <!ENTITY torsettings.useProxy.type "Starpnieka tips:"> <!ENTITY torsettings.useProxy.address "Adrese:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums"> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 4c14d3d..c9f028b 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.connectPrompt3 "Ово ће радити у већини ситуација."> <!ENTITY torSettings.connect "Повежи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!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.enterProxy "Унесите proxy подешавања."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index ec16b2b..5f9422f 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -1,24 +1,24 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Podešavanja Tor mreže">  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Pre nego što se konektujete na Tor mrežu, potrebno je da pružite informacije o internet konekciji ovog kompjutera."> <!ENTITY torSettings.yes "Da"> <!ENTITY torSettings.no "Ne"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> +<!ENTITY torSettings.firstQuestion "Koji od ponuđenih najbolje opisuje vašu situaciju?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored or proxied."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.configure "Konfiguriši"> +<!ENTITY torSettings.connectPrompt2 "Želim da se direktno povežem na Tor mrežu."> +<!ENTITY torSettings.connectPrompt3 "Ovo će raditi u većini situacija."> +<!ENTITY torSettings.connect "Povezivanje"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Da li ovaj kompjuter koristi lokalni proksi za 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.enterProxy "Enter the proxy settings."> +<!ENTITY torSettings.enterProxy "Unesite vaša proksi podešavanja."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -26,22 +26,22 @@  <!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> +<!ENTITY torsettings.restartTor "Restartovanje Tor-a"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Opciono"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> <!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Korisničko ime:"> <!ENTITY torsettings.useProxy.password "Lozinka:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> +<!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 "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> +<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi: "> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Transport type:"> diff --git a/src/chrome/locale/sr(a)latin/torlauncher.properties b/src/chrome/locale/sr(a)latin/torlauncher.properties index 02be756..a5e87ea 100644 --- a/src/chrome/locale/sr(a)latin/torlauncher.properties +++ b/src/chrome/locale/sr(a)latin/torlauncher.properties @@ -29,8 +29,8 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor +torlauncher.connect=Povezivanje +torlauncher.restart_tor=Restartovanje Tor-a torlauncher.quit=Quit torlauncher.quit_win=Exit torlauncher.done=Done diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 4e6d5e1..37e815e 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -47,9 +47,9 @@ <!ENTITY torsettings.useBridges.type "传输类型："> <!ENTITY torsettings.useBridges.custom "输入自定义网桥"> <!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。"> -<!ENTITY torsettings.useBridges.placeholder "输入地址:端口"> +<!ENTITY torsettings.useBridges.placeholder "类型地址:端口"> -<!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板"> +<!ENTITY torsettings.copyLog "点击复制 Tor 日志"> <!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助"> <!ENTITY torsettings.bridgeHelp1 "如果 Tor 网络无法连接，可能是因为互联网服务提供商 (ISP) 或其他机构对 Tor 进行了封锁。通常，使用 Tor 网桥可以解决这种问题。网桥指未公开的网络中继，更难于封锁。"> <!ENTITY torsettings.bridgeHelp1B "你可以使用本软件集成的一组网桥，也可以通过以下三种方法获取网桥。">

1 0

[tor-launcher/master] Bump version to 0.2.7.4.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 360f70048a5e2338c52112a6507ee220ea330866 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:58:25 2015 -0700 Bump version to 0.2.7.4. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index c27be00..b2ca19c 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.3</em:version> + <em:version>0.2.7.4</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-browser-bundle/master] Update changelog for bug 15502.
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 44c07072325b31478b06a874d700d518389932f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 19:46:08 2015 -0700 Update changelog for bug 15502. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index bbd4bd8..7e4b01c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,7 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 13875: Spoof window.devicePixelRatio to avoid DPI fingerprinting * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display + * Bug 15502: Isolate blob URI scope to URL domain; block WebWorker access * Bug 15562: Disable Javascript SharedWorkers due to third party tracking * Bug 15757: Disable Mozilla video statistics API extensions * Bug 15758: Disable Device Sensor APIs

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 0d67ab406bdd3cf095802cb25c081641aa1f0bcc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Apr 12 13:47:55 2015 -0700 Bug #15502. Isolate blob URLs to first party; no blobURLs in Web Workers --- content/base/src/ThirdPartyUtil.cpp | 9 +++++++++ content/base/src/nsHostObjectProtocolHandler.cpp | 23 ++++++++++++++++++++-- dom/workers/URL.cpp | 7 +++++++ netwerk/base/public/mozIThirdPartyUtil.idl | 15 ++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/content/base/src/ThirdPartyUtil.cpp b/content/base/src/ThirdPartyUtil.cpp index 695392f..0e037d1 100644 --- a/content/base/src/ThirdPartyUtil.cpp +++ b/content/base/src/ThirdPartyUtil.cpp @@ -635,3 +635,12 @@ ThirdPartyUtil::GetFirstPartyHostForIsolation(nsIURI *aFirstPartyURI, aHost.Append("--"); return NS_OK; } + +NS_IMETHODIMP +ThirdPartyUtil::GetFirstPartyHostFromCaller(nsACString& aHost) { + nsCOMPtr<nsIURI> uri; + nsresult rv = GetFirstPartyIsolationURI(nullptr, + nsContentUtils::GetDocumentFromCaller(), getter_AddRefs(uri)); + NS_ENSURE_SUCCESS(rv, rv); + return GetFirstPartyHostForIsolation(uri, aHost); +} diff --git a/content/base/src/nsHostObjectProtocolHandler.cpp b/content/base/src/nsHostObjectProtocolHandler.cpp index 10ec44c..e578804 100644 --- a/content/base/src/nsHostObjectProtocolHandler.cpp +++ b/content/base/src/nsHostObjectProtocolHandler.cpp @@ -15,6 +15,7 @@ #include "mozilla/dom/MediaSource.h" #include "nsIMemoryReporter.h" #include "mozilla/Preferences.h" +#include "mozIThirdPartyUtil.h" // ----------------------------------------------------------------------- // Hash table @@ -24,9 +25,20 @@ struct DataInfo nsCOMPtr<nsISupports> mObject; nsCOMPtr<nsIPrincipal> mPrincipal; nsCString mStack; + nsCString mFirstPartyHost; }; static nsClassHashtable<nsCStringHashKey, DataInfo>* gDataTable; +static nsCOMPtr<mozIThirdPartyUtil> gThirdPartyUtilService; + +static nsCString GetFirstPartyHostFromCaller() { + if (!gThirdPartyUtilService) { + gThirdPartyUtilService = do_GetService(THIRDPARTYUTIL_CONTRACTID); + } + nsCString host; + gThirdPartyUtilService->GetFirstPartyHostFromCaller(host); + return host; +} // Memory reporting for the hash table. namespace mozilla { @@ -290,6 +302,8 @@ nsHostObjectProtocolHandler::AddDataEntry(const nsACString& aScheme, info->mObject = aObject; info->mPrincipal = aPrincipal; + // Record the first party host that originated this object. + info->mFirstPartyHost = GetFirstPartyHostFromCaller(); mozilla::BlobURLsReporter::GetJSStackForBlob(info); gDataTable->Put(aUri, info); @@ -401,7 +415,10 @@ GetDataObject(nsIURI* aURI) aURI->GetSpec(spec); DataInfo* info = GetDataInfo(spec); - return info ? info->mObject : nullptr; + // Deny access to this object if the current first-party host + // doesn't match the originating first-party host. + return (info && info->mFirstPartyHost == GetFirstPartyHostFromCaller()) + ? info->mObject : nullptr; } // ----------------------------------------------------------------------- @@ -457,7 +474,9 @@ nsHostObjectProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result) DataInfo* info = GetDataInfo(spec); - if (!info) { + // Deny access to this URI if the current first party host + // doesn't match the first party host when it was created. + if (!info || (info->mFirstPartyHost != GetFirstPartyHostFromCaller())) { return NS_ERROR_DOM_BAD_URI; } nsCOMPtr<nsIDOMBlob> blob = do_QueryInterface(info->mObject); diff --git a/dom/workers/URL.cpp b/dom/workers/URL.cpp index f80594e..d52e4c6 100644 --- a/dom/workers/URL.cpp +++ b/dom/workers/URL.cpp @@ -894,6 +894,13 @@ URL::CreateObjectURL(const GlobalObject& aGlobal, JSObject* aBlob, JSContext* cx = aGlobal.GetContext(); WorkerPrivate* workerPrivate = GetWorkerPrivateFromContext(cx); + if (!workerPrivate->IsChromeWorker()) { + workerPrivate->ReportError(cx, "Worker attempted to use createObjectURL; denied.", nullptr); + NS_NAMED_LITERAL_STRING(argStr, "URL.createObjectURL"); + aRv.ThrowTypeError(MSG_METHOD_THIS_UNWRAPPING_DENIED, &argStr); + return; + } + nsCOMPtr<nsIDOMBlob> blob = file::GetDOMBlobFromJSObject(aBlob); if (!blob) { SetDOMStringToNull(aResult); diff --git a/netwerk/base/public/mozIThirdPartyUtil.idl b/netwerk/base/public/mozIThirdPartyUtil.idl index 0bb632b..0b0f410 100644 --- a/netwerk/base/public/mozIThirdPartyUtil.idl +++ b/netwerk/base/public/mozIThirdPartyUtil.idl @@ -246,6 +246,21 @@ interface mozIThirdPartyUtil : nsISupports * for which we generate a pseudo host. */ AUTF8String getFirstPartyHostForIsolation(in nsIURI aFirstPartyURI); + + /** + * getFirstPartyHostFromCaller + * + * Obtain the host or pseudo-host for the first party URI belonging + * to the calling document. See getFirstPartyHostForIsolation(...) for + * examples. + * + * @return host or pseudo host. + * + * @throws if the calling document's first party URI lacks a host + * and the scheme is not a whitelisted one for which we + * generate a pseudo host. + */ + AUTF8String getFirstPartyHostFromCaller(); }; %{ C++

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit 71adcfc9a5adf7aeeed0dfa2719ccd59cc84881e Merge: 89bd8f1 f4f2caa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 18:05:08 2015 -0700 Merge remote-tracking branch 'arthur/15502+8' into tor-browser-31.6.0esr-4.5-1 content/base/src/ThirdPartyUtil.cpp | 9 ++ content/base/src/nsHostObjectProtocolHandler.cpp | 23 ++++- content/base/test/bug15502_page_blobify.html | 26 ++++++ content/base/test/bug15502_page_deblobify.html | 31 +++++++ content/base/test/bug15502_tab.html | 39 ++++++++ content/base/test/bug15502_utils.js | 104 ++++++++++++++++++++++ content/base/test/bug15502_worker_blobify.html | 28 ++++++ content/base/test/bug15502_worker_blobify.js | 12 +++ content/base/test/bug15502_worker_deblobify.html | 30 +++++++ content/base/test/bug15502_worker_deblobify.js | 24 +++++ content/base/test/mochitest.ini | 9 ++ content/base/test/test_tor_bug15502.html | 92 +++++++++++++++++++ dom/workers/URL.cpp | 7 ++ netwerk/base/public/mozIThirdPartyUtil.idl | 15 ++++ 14 files changed, 447 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Bug #15502, Part 2: Regression tests for blob URL isolation
by mikeperry＠torproject.org 22 Apr '15

22 Apr '15

commit f4f2caa26dd2d15e8f99d0a1357361da43e4fd2f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Apr 18 17:37:21 2015 -0700 Bug #15502, Part 2: Regression tests for blob URL isolation --- content/base/test/bug15502_page_blobify.html | 26 ++++++ content/base/test/bug15502_page_deblobify.html | 31 +++++++ content/base/test/bug15502_tab.html | 39 ++++++++ content/base/test/bug15502_utils.js | 104 ++++++++++++++++++++++ content/base/test/bug15502_worker_blobify.html | 28 ++++++ content/base/test/bug15502_worker_blobify.js | 12 +++ content/base/test/bug15502_worker_deblobify.html | 30 +++++++ content/base/test/bug15502_worker_deblobify.js | 24 +++++ content/base/test/mochitest.ini | 9 ++ content/base/test/test_tor_bug15502.html | 92 +++++++++++++++++++ 10 files changed, 395 insertions(+) diff --git a/content/base/test/bug15502_page_blobify.html b/content/base/test/bug15502_page_blobify.html new file mode 100644 index 0000000..d883929 --- /dev/null +++ b/content/base/test/bug15502_page_blobify.html @@ -0,0 +1,26 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page blobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + blobURL = stringToBlobURL(message); + sendMessage(window.parent, blobURL); + appendLine("display", message + " -> " + blobURL); +}); + +</script> +</body> +</html> diff --git a/content/base/test/bug15502_page_deblobify.html b/content/base/test/bug15502_page_deblobify.html new file mode 100644 index 0000000..e8cbd51 --- /dev/null +++ b/content/base/test/bug15502_page_deblobify.html @@ -0,0 +1,31 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Page deblobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let blobURL = yield receiveMessage(window.parent), + string; + try { + string = yield blobURLtoString(blobURL); + } catch (e) { + string = e.message; + } + sendMessage(window.parent, string); + appendLine("display", blobURL + " -> " + string); +}); + +</script> +</body> +</html> diff --git a/content/base/test/bug15502_tab.html b/content/base/test/bug15502_tab.html new file mode 100644 index 0000000..7bd4744 --- /dev/null +++ b/content/base/test/bug15502_tab.html @@ -0,0 +1,39 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Tab for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> + +<div id="display"></div> +<iframe id="child" width="100%"></iframe> + +<script type="text/javascript;version=1.7"> + +let iframe = document.getElementById("child"); + +let connect = function (sourceObject, destinationObject) { + Task.spawn(function* () { + for (;;) { + let message = yield receiveMessage(sourceObject); + sendMessage(destinationObject, message); + } + }); +}; + +Task.spawn(function* () { + sendMessage(window.opener, "ready"); + let firstParentMessage = yield receiveMessage(window.opener); + iframe.src = firstParentMessage; + connect(window.opener, iframe.contentWindow); + connect(iframe.contentWindow, window.opener); +}); +</script> + +</body> +</html> diff --git a/content/base/test/bug15502_utils.js b/content/base/test/bug15502_utils.js new file mode 100644 index 0000000..9d69c12 --- /dev/null +++ b/content/base/test/bug15502_utils.js @@ -0,0 +1,104 @@ +// Import Task.jsm +let { Task } = SpecialPowers.Cu.import("resource://gre/modules/Task.jsm"); + +// __listen(target, eventType, timeoutMs, useCapture)__. +// Calls addEventListener on target, with the given eventType. +// Returns a Promise that resolves to an Event object, if the event fires. +// If a timeout occurs, then Promise is rejected with a "Timed out" error. +// For use with Task.jsm. +let listen = function (target, eventType, timeoutMs, useCapture) { + return new Promise(function (resolve, reject) { + let listenFunction = function (event) { + target.removeEventListener(eventType, listenFunction, useCapture); + resolve(event); + }; + target.addEventListener(eventType, listenFunction, useCapture); + setTimeout(() => reject(new Error("Timed out")), timeoutMs); + }); +}; + +// __receiveMessage(source)__. +// Returns an event object for the next message received from source. +// A Task.jsm coroutine. +let receiveMessage = function* (source) { + let event; + do { + event = yield listen(self, "message", 5000, false); + } while (event.source !== source); + return event.data; +}; + +// __sendMessage(destination, message)__. +// Sends a message to destination. +let sendMessage = function (destination, message) { + destination.postMessage(message, "*"); +}; + +// __appendLine(id, lineString)__. +// Add a line of text to the innerHTML of element with id. +let appendLine = function (id, lineString) { + document.getElementById(id).innerHTML += lineString + "\n"; +}; + +// __xhr(method, url, responseType__. +// A simple async XMLHttpRequest call. +// Returns a promise with the response. +let xhr = function (method, url, responseType) { + return new Promise(function (resolve, reject) { + let xhr = new XMLHttpRequest(); + xhr.open(method, url, true); + xhr.onload = function () { + resolve(xhr.response); + }; + xhr.responseType = responseType; + xhr.send(); + }); +}; + +// __blobURLtoBlob(blobURL)__. +// Asynchronously retrieves a blob object +// from a blob URL. Returns a promise. +let blobURLtoBlob = function (blobURL) { + return xhr("GET", blobURL, "blob"); +}; + +// __blobToString(blob)__. +// Asynchronously reads the contents +// of a blob object into a string. Returns a promise. +let blobToString = function (blob) { + return new Promise(function (resolve, reject) { + let fileReader = new FileReader(); + fileReader.onload = function () { + resolve(fileReader.result); + }; + fileReader.readAsText(blob); + }); +}; + +// __blobURLtoString(blobURL)__. +// Asynchronous coroutine that takes a blobURL +// and returns the contents in a string. +let blobURLtoString = function* (blobURL) { + let blob = yield blobURLtoBlob(blobURL); + return yield blobToString(blob); +}; + +// __stringToBlobURL(s)__. +// Converts string s into a blob, and returns +// a blob URL. +let stringToBlobURL = function (s) { + let blob = new Blob([s]); + return URL.createObjectURL(blob); +}; + +// __workerIO(scriptFile, inputString)__. +// Sends inputString for the worker, and waits +// for the worker to return an outputString. +// Task.jsm coroutine. +let workerIO = function* (scriptFile, inputString) { + let worker = new Worker(scriptFile); + worker.postMessage(inputString); + let result = yield listen(worker, "message", 5000, false); + worker.terminate(); + return result.data; +}; diff --git a/content/base/test/bug15502_worker_blobify.html b/content/base/test/bug15502_worker_blobify.html new file mode 100644 index 0000000..3dd7926 --- /dev/null +++ b/content/base/test/bug15502_worker_blobify.html @@ -0,0 +1,28 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Worker blobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<pre id="test"> +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let message = yield receiveMessage(window.parent), + blobURL = yield workerIO("bug15502_worker_blobify.js", message); + sendMessage(window.parent, blobURL); + appendLine("display", message + " -> " + blobURL); +}); + +</script> +</pre> +</body> +</html> diff --git a/content/base/test/bug15502_worker_blobify.js b/content/base/test/bug15502_worker_blobify.js new file mode 100644 index 0000000..4aef347 --- /dev/null +++ b/content/base/test/bug15502_worker_blobify.js @@ -0,0 +1,12 @@ +// Wait for a string to be posted to this worker. +// Create a blob containing this string, and then +// post back a blob URL pointing to the blob. +self.addEventListener("message", function (e) { + try { + var blob = new Blob([e.data]), + blobURL = URL.createObjectURL(blob); + postMessage(blobURL); + } catch (e) { + postMessage(e.message); + } +}, false); diff --git a/content/base/test/bug15502_worker_deblobify.html b/content/base/test/bug15502_worker_deblobify.html new file mode 100644 index 0000000..30ec6b4 --- /dev/null +++ b/content/base/test/bug15502_worker_deblobify.html @@ -0,0 +1,30 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Worker deblobifier for Tor Browser Bug 15502</title> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> +</head> +<body> +<div id="display" style="white-space:pre; font-family:monospace; display:inline;"></div> + +<pre id="test"> +<script type="text/javascript;version=1.7"> + +Task.spawn(function* () { + sendMessage(window.parent, "ready"); + let blobURL = yield receiveMessage(window.parent), + result = yield workerIO("bug15502_worker_deblobify.js", blobURL); + sendMessage(window.parent, result); + appendLine("display", blobURL + " -> " + result); +}); + + + +</script> +</pre> +</body> +</html> diff --git a/content/base/test/bug15502_worker_deblobify.js b/content/base/test/bug15502_worker_deblobify.js new file mode 100644 index 0000000..8556311 --- /dev/null +++ b/content/base/test/bug15502_worker_deblobify.js @@ -0,0 +1,24 @@ +// Wait for a blob URL to be posted to this worker. +// Obtain the blob, and read the string contained in it. +// Post back the string. + +var postStringInBlob = function (blobObject) { + var fileReader = new FileReaderSync(), + result = fileReader.readAsText(blobObject); + postMessage(result); +}; + +self.addEventListener("message", function (e) { + var blobURL = e.data, + xhr = new XMLHttpRequest(); + try { + xhr.open("GET", blobURL, true); + xhr.onload = function () { + postStringInBlob(xhr.response); + }; + xhr.responseType = "blob"; + xhr.send(); + } catch (e) { + postMessage(e.message); + } +}, false); diff --git a/content/base/test/mochitest.ini b/content/base/test/mochitest.ini index c3cffb3..e59a70a 100644 --- a/content/base/test/mochitest.ini +++ b/content/base/test/mochitest.ini @@ -12,6 +12,14 @@ support-files = badMessageEvent.eventsource^headers^ badMessageEvent2.eventsource badMessageEvent2.eventsource^headers^ + bug15502_page_blobify.html + bug15502_page_deblobify.html + bug15502_tab.html + bug15502_utils.js + bug15502_worker_blobify.js + bug15502_worker_blobify.html + bug15502_worker_deblobify.js + bug15502_worker_deblobify.html bug282547.sjs bug298064-subframe.html bug313646.txt @@ -604,6 +612,7 @@ skip-if = toolkit == 'android' || e10s #RANDOM [test_textnode_normalize_in_selection.html] [test_textnode_split_in_selection.html] [test_title.html] +[test_tor_bug15502.html] [test_treewalker_nextsibling.xml] [test_viewport_scroll.html] [test_viewsource_forbidden_in_object.html] diff --git a/content/base/test/test_tor_bug15502.html b/content/base/test/test_tor_bug15502.html new file mode 100644 index 0000000..9ed3d70 --- /dev/null +++ b/content/base/test/test_tor_bug15502.html @@ -0,0 +1,92 @@ +<!DOCTYPE HTML> +<html> + +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Test for Tor Browser Bug 15502</title> + <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="text/javascript;version=1.7" src="bug15502_utils.js"></script> + <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" /> +</head> +<body> +<p id="display"></p> +<div id="content"></div> + +<script class="testbody" type="application/javascript;version=1.7"> +SimpleTest.waitForExplicitFinish(); + +// __prefs__. Import the `Serivces.prefs` object. +let prefs = SpecialPowers.Cu.import("resource://gre/modules/Services.jsm").Services.prefs; + +// ## Testing constants +let domain1 = "http://example.com", + domain2 = "http://example.net", + path = "/tests/content/base/test/", + page_blob = "bug15502_page_blobify.html", + page_deblob = "bug15502_page_deblobify.html" + worker_blob = "bug15502_worker_blobify.html", + worker_deblob = "bug15502_worker_deblobify.html"; + +// __tabIO(domain, child, input)__. +// Open a tab at the given `domain` and `child` page. Post an +// `input` message to the tab. +let tabIO = function* (domain, child, input) { + tab = window.open(domain + path + "bug15502_tab.html", "_blank"); + yield receiveMessage(tab); // ready message + sendMessage(tab, "http://example.org" + path + child); + yield receiveMessage(tab); // ready message + sendMessage(tab, input); + return yield receiveMessage(tab); +}; + +// __blobTest(isolationOn, domainA, domainB, blobPage, deblobPage)__. +// Run a test where we set the pref "privacy.thirdparty.isolate` to on or off, +// and then create a blob URL in `domainA`, using the page `blobPage`, +// and then attempt to retrieve the object from the blobURL in `domainB`, using +// the page `deblobPage`. +let blobTest = function* (isolationOn, domainA, domainB, blobPage, deblobPage) { + prefs.setIntPref("privacy.thirdparty.isolate", isolationOn ? 2 : 0); + let input = "" + Math.random(), + blobURL = yield tabIO(domainA, blobPage, input), + result = yield tabIO(domainB, deblobPage, blobURL), + description = domainA + ":" + blobPage + "->" + domainB + ":" + deblobPage + ", isolation " + (isolationOn ? "on." : "off."); + if (blobPage === worker_blob) { + // Remove this case when we write a patch that properly isolates web worker blob URLs + // by first party domain. + ok(blobURL.contains("Permission to call 'URL.createObjectURL' denied."), description + " Deny blob URL creation in web worker"); + } else if (deblobPage === worker_deblob && isolationOn) { + // Remove this case when we write a patch that properly isolates web worker blob URLs + // by first party domain. + ok(result.contains("Access to restricted URI denied"), description + " Isolated blobs not available to web workers"); + } else { + if (isolationOn && domainA !== domainB) { + ok(input !== result, description + " Deny retrieval"); + } else { + ok(input === result, description + " Allow retrieval"); + } + } +}; + + +// ## The main test +// Run a Task.jsm coroutine that tests various combinations of domains +// methods, and isolation states for reading and writing blob URLs. +Task.spawn(function* () { + for (let isolate of [false, true]) { + for (let domainB of [domain1, domain2]) { + for (let blob of [page_blob, worker_blob]) { + for (let deblob of [page_deblob, worker_deblob]) { + yield blobTest(isolate, domain1, domainB, blob, deblob); + } + } + } + } + SimpleTest.finish(); +}); + +</script> + +</body> +</html>

1 0

[tor-browser-bundle/master] Update changelog for bugs 15757 and 15758.
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 1e294bc7704cf6daf7b83aa54985ab5c78a11d28 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:31:31 2015 -0700 Update changelog for bugs 15757 and 15758. --- 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 70fe201..bbd4bd8 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -23,6 +23,8 @@ Tor Browser 4.5 -- Apr 28 2015 * Bug 15411: Remove old (and unused) cacheDomain cache isolation mechanism * Bug 14716: Fix issues with HTTP Auth usage and TLS connection info display * Bug 15562: Disable Javascript SharedWorkers due to third party tracking + * Bug 15757: Disable Mozilla video statistics API extensions + * Bug 15758: Disable Device Sensor APIs * Linux * Bug 15747: Improve start-tor-browser argument handling * Bug 15672: Provide desktop app registration+unregistration for Linux

1 0