- tbb-commits - lists.torproject.org

[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] 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

[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

[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 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