- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 19528: run get-moz-build-date before removing .git (fixup)
by gk＠torproject.org 14 Sep '16

14 Sep '16

commit 02ff59eaeb1bea0ce00ee0223da9eab0ff69834d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 14 17:11:38 2016 +0200 Bug 19528: run get-moz-build-date before removing .git (fixup) Additionally, we make get-moz-build-date fail with an error if it was not possible to get the year from git. --- gitian/build-helpers/get-moz-build-date | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 3 ++- gitian/descriptors/mac/gitian-firefox.yml | 3 ++- gitian/descriptors/windows/gitian-firefox.yml | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/get-moz-build-date b/gitian/build-helpers/get-moz-build-date index 168a8c7..3dae232 100755 --- a/gitian/build-helpers/get-moz-build-date +++ b/gitian/build-helpers/get-moz-build-date @@ -4,6 +4,11 @@ use strict; my ($year) = split('-', `git show -s --format='%ci'`); +if ($? != 0) { + print STDERR "Failed to get year from the git commit\n"; + print "exit 1\n"; + exit 1; +} die "missing argument" unless @ARGV; my $version = $ARGV[0]; diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 14799d6..79356a9 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -88,12 +88,13 @@ script: | mkdir -p $INSTDIR/Debug/Browser/browser/components cd tor-browser + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index bd7d7f7..607a04c 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -43,13 +43,14 @@ script: | TB_COMMIT_DATE=$(git show -s --format='%ci') COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*} mv .mozconfig-mac .mozconfig + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" make $MAKEOPTS -f client.mk build diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 788b053..cc7fdeb 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -68,13 +68,14 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" + # run get-moz-build-date before removing .git, which is used to get the year + eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" rm -f configure rm -f js/src/configure - eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} --enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" #

1 0

[torbutton/master] Bug 17767: Move 'JavaScript disabled' to top of Security Slider list
by gk＠torproject.org 13 Sep '16

13 Sep '16

commit fe6c10c893f3aed2d58e5b0c1b703543d7286f96 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Sep 9 11:28:41 2016 -0700 Bug 17767: Move 'JavaScript disabled' to top of Security Slider list --- src/chrome/content/preferences.xul | 42 +++++++++++++++++++------------------- src/chrome/locale/en/torbutton.dtd | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 507efd0..8ea448c 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -78,14 +78,18 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_all_js_desc; </description> <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -98,10 +102,6 @@ &torbutton.prefs.sec_font_rend_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_all_js_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_svg_desc_tooltip;"> &torbutton.prefs.sec_svg_desc; </description> @@ -116,14 +116,18 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; + tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> + &torbutton.prefs.sec_js_https_desc; </description> <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip; &torbutton.prefs.sec_baseline_jit_desc_tooltip;"> &torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -135,10 +139,6 @@ tooltiptext="&torbutton.prefs.sec_font_rend_svg_tooltip;"> &torbutton.prefs.sec_font_rend_desc; </description> - <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_js_desc_tooltip;"> - &torbutton.prefs.sec_js_https_desc; - </description> </vbox> <vbox id="desc_medium_low" collapsed="true"> <description @@ -146,14 +146,14 @@ &torbutton.prefs.sec_gen_desc; </description> <description class="slider-text-size" - tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> - &torbutton.prefs.sec_html5_desc; - </description> - <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jit_desc_tooltip;"> &torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc; </description> <description class="slider-text-size" + tooltiptext="&torbutton.prefs.sec_html5_tooltip;"> + &torbutton.prefs.sec_html5_desc; + </description> + <description class="slider-text-size" tooltiptext="&torbutton.prefs.sec_jar_tooltip;"> &torbutton.prefs.sec_jar_desc; </description> @@ -188,12 +188,12 @@ <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_all_js_desc;</html:div> <html:div>&torbutton.prefs.sec_svg_desc;</html:div> <html:div>&torbutton.prefs.sec_webfonts_desc;</html:div> </tooltip> @@ -201,19 +201,19 @@ <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> + <html:div>&torbutton.prefs.sec_all_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> <html:div>&torbutton.prefs.sec_font_rend_desc;</html:div> - <html:div>&torbutton.prefs.sec_js_https_desc;</html:div> </tooltip> <tooltip id="ml_preview"> <html:b>&torbutton.prefs.sec_gen_desc;</html:b> <html:br></html:br> <html:br></html:br> + <html:div>&torbutton.prefs.sec_some_jit_desc; &torbutton.prefs.sec_jit_slower_desc;</html:div> <html:div>&torbutton.prefs.sec_html5_desc;</html:div> - <html:div>&torbutton.prefs.sec_some_jit_desc;</html:div> <html:div>&torbutton.prefs.sec_jar_desc;</html:div> <html:div>&torbutton.prefs.sec_mathml_desc;</html:div> </tooltip> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0720208..4bca4c7 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -47,7 +47,7 @@ <!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_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "All JavaScript performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, 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.">

1 0

[tor-browser-bundle/hardened-builds] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4023bc26f3a371dbdadc7659eb511c6d2a5b4d5c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 2db8739..4bbb8a4 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -35,7 +35,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -125,7 +124,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./config -shared --prefix=$INSTDIR/openssl enable-ec_nistp_64_gcc_128 # Using $MAKEOPTS breaks the build. Might be the issue mentioned on diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9296724..0286f58 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -24,7 +24,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -131,7 +130,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] Bug 20133: Don't apply OpenSSL patch anymore
by gk＠torproject.org 12 Sep '16

12 Sep '16

commit 4e2d9e7d4a0e0485ee5a5654e98c7262b9e6c03c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 12 12:31:26 2016 +0000 Bug 20133: Don't apply OpenSSL patch anymore The patch we applied for building OpenSSL reproducible got upstreamed into 1.0.2. Thus, we don't need to apply it anymore after switching to the new OpenSSL series. --- gitian/descriptors/linux/gitian-utils.yml | 2 -- gitian/descriptors/windows/gitian-utils.yml | 2 -- .../patches/openssl-Make-build-reproducible.patch | 28 ---------------------- 3 files changed, 32 deletions(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0adcf5d..7093a0d 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -32,7 +32,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "versions" - "dzip.sh" @@ -97,7 +96,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" if [ $GBUILD_BITS == "64" ]; then diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 0876bff..9c31834 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -27,7 +27,6 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" -- "openssl-Make-build-reproducible.patch" - "gmp.tar.bz2" - "enable-reloc-section-ld.patch" - "peXXigen.patch" @@ -137,7 +136,6 @@ script: | # Building OpenSSL tar xzf openssl.tar.gz cd openssl-* - patch -p1 < ../openssl-Make-build-reproducible.patch find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl diff --git a/gitian/patches/openssl-Make-build-reproducible.patch b/gitian/patches/openssl-Make-build-reproducible.patch deleted file mode 100644 index d86f5ba..0000000 --- a/gitian/patches/openssl-Make-build-reproducible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b88c021b5a7c539f821b7b7c47c72138cc3c3271 Mon Sep 17 00:00:00 2001 -From: Kurt Roeckx <kurt(a)roeckx.be> -Date: Fri, 2 Jan 2015 12:27:57 +0100 -Subject: [PATCH] Make build reproducible - -It contained a date on when it was build. - -Reviewed-by: Rich Salz <rsalz(a)openssl.org> ---- - crypto/cversion.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/cversion.c b/crypto/cversion.c -index 9e6f50d78182..c417d1d1121f 100644 ---- a/crypto/cversion.c -+++ b/crypto/cversion.c -@@ -68,7 +68,11 @@ const char *SSLeay_version(int t) - return OPENSSL_VERSION_TEXT; - if (t == SSLEAY_BUILT_ON) { - #ifdef DATE -+# ifdef OPENSSL_USE_BUILD_DATE - return (DATE); -+# else -+ return("built on: reproducible build, date unspecified"); -+# endif - #else - return ("built on: date not available"); - #endif

1 0

[tor-browser-bundle/master] We have 2016 already
by gk＠torproject.org 10 Sep '16

10 Sep '16

commit 587aa59bbb39529cc69df18c2615cc6963df0aad Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 10 12:22:06 2016 +0000 We have 2016 already --- Bundle-Data/Docs/ChangeLog.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4506e37..60a60cf 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,10 +1,10 @@ -Tor Browser 6.0.4 -- August 16 +Tor Browser 6.0.4 -- August 16 2016 * All Platforms * Update Tor to 0.2.8.6 * Update NoScript to 2.9.0.14 * Bug 19890: Disable installation of system addons -Tor Browser 6.5a2-hardened -- August 3 +Tor Browser 6.5a2-hardened -- August 3 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Tor to tor-0.2.8.5-rc @@ -37,7 +37,7 @@ Tor Browser 6.5a2-hardened -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 -Tor Browser 6.5a2 -- August 3 +Tor Browser 6.5a2 -- August 3 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Tor to tor-0.2.8.5-rc @@ -77,7 +77,7 @@ Tor Browser 6.5a2 -- August 3 * All Platforms * Bug 19703: Upgrade Go to 1.6.3 -Tor Browser 6.0.3 -- August 2 +Tor Browser 6.0.3 -- August 2 2016 * All Platforms * Update Firefox to 45.3.0esr * Update Torbutton to 1.9.5.6 @@ -96,7 +96,7 @@ Tor Browser 6.0.3 -- August 2 * Android * Bug 19484: Avoid compilation error when MOZ_UPDATER is not defined -Tor Browser 6.0.2 -- June 21 +Tor Browser 6.0.2 -- June 21 2016 * All Platforms * Update Torbutton to 1.9.5.5 * Bug 19417: Clear asmjscache @@ -108,7 +108,7 @@ Tor Browser 6.0.2 -- June 21 * Linux * Bug 19276: Disable Xrender due to possible performance regressions -Tor Browser 6.5a1-hardened -- June 8 +Tor Browser 6.5a1-hardened -- June 8 2016 * All Platforms * Update Firefox to 45.2.0esr * Update Tor to 0.2.8.3-alpha @@ -162,7 +162,7 @@ Tor Browser 6.5a1-hardened -- June 8 * Bug 18291: Remove some uses of libfaketime * Bug 18845: Make zip and tar helpers generate reproducible archives -Tor Browser 6.5a1 -- June 8 +Tor Browser 6.5a1 -- June 8 2016 * All Platforms * Update Firefox to 45.2.0esr * Update Tor to 0.2.8.3-alpha @@ -221,7 +221,7 @@ Tor Browser 6.5a1 -- June 8 * Bug 18291: Remove some uses of libfaketime * Bug 18845: Make zip and tar helpers generate reproducible archives -Tor Browser 6.0.1 -- June 7 +Tor Browser 6.0.1 -- June 7 2016 * All Platforms * Update Firefox to 45.2.0esr * Bug 18884: Don't build the loop extension @@ -230,7 +230,7 @@ Tor Browser 6.0.1 -- June 7 * Linux * Bug 19189: Backport for working around a linker (gold) bug -Tor Browser 6.0 -- May 30 +Tor Browser 6.0 -- May 30 2016 * All Platforms * Update Firefox to 45.1.1esr * Update OpenSSL to 1.0.1t

1 0

[tor-browser-bundle/master] Bug 20118: Don't unpack HTTPS Everywhere anymore
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit ae5f3f9f9bb12a0e07d268262c6e5b8e3b0baf88 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:30:44 2016 +0000 Bug 20118: Don't unpack HTTPS Everywhere anymore Starting with version 5.2.2 HTTPS Everywhere is not unpacked anymore. We should keep it unpacked as well, especially as that fixes usability issues like #20033. --- gitian/descriptors/linux/gitian-bundle.yml | 9 +++------ gitian/descriptors/mac/gitian-bundle.yml | 9 +++------ gitian/descriptors/windows/gitian-bundle.yml | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 105cab7..b08fbcc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -71,7 +71,7 @@ script: | # directory named tor-browser (instead of tor-browser_en-US). Therefore we # stage everything under tor-browser-stage to avoid a conflict. TB_STAGE_DIR=tor-browser-stage - mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/Caches mkdir -p ${TB_STAGE_DIR}/Browser/TorBrowser/Docs/sources/ @@ -109,16 +109,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd ${TB_STAGE_DIR}/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org/ - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build # cd meek/firefox diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index d644a56..4f12174 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -104,7 +104,7 @@ script: | MARTOOLS=~/build/mar-tools # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff(a)eff.org + mkdir -p $TORBROWSER_NAME.app/$EXTSPATH mkdir -p $TORBROWSER_NAME.app/$MEEKPROFILEPATH/extensions mkdir -p $TORBROWSER_NAME.app/$DOCSPATH/sources mkdir -p $TORBROWSER_NAME.app/Contents/MacOS @@ -139,16 +139,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi ./$TORBROWSER_NAME.app/$EXTSPATH/ cd $TORBROWSER_NAME.app/$EXTSPATH/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # cd meek/firefox diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index d065f60..e563308 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -76,7 +76,7 @@ script: | export PATH=$INSTDIR/nsis/bin:$PATH # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.meek-http-helper/extensions mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources @@ -109,16 +109,13 @@ script: | rm -f .git/refs/heads/master ./makexpi.sh # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. - rm ./pkg/*-amo.xpi - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + rm pkg/*-amo.xpi + cp pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-eff(a)eff.org.xpi cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd https-everywhere-eff(a)eff.org - unzip ../https-everywhere(a)eff.org.xpi - rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # cd meek/firefox

1 0

[torbutton/master] Adding translation update to CHANGELOG
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 57002e877310f8c1e136f733f946dee6677958d3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:46:21 2016 +0000 Adding translation update to CHANGELOG --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 25c4c95..599645c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -5,6 +5,7 @@ * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 * Bug 14271: Make Torbutton work with Unix Domain Socket option + * Translation updates 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client

1 0

[torbutton/master] Release preparations for 1.9.6.2
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 0520c426f6a6b7997962ca53b4ca154ce5285dc0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:45:29 2016 +0000 Release preparations for 1.9.6.2 --- src/CHANGELOG | 8 ++++++++ src/install.rdf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index cd5ce27..25c4c95 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,11 @@ +1.9.6.2 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 14271: Make Torbutton work with Unix Domain Socket option + 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) diff --git a/src/install.rdf b/src/install.rdf index e33fdb9..5936299 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.6.1</em:version> + <em:version>1.9.6.2</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Translation updates
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit a84c726d08e9661a860eb3e8288f3acb1cc23f58 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 9 17:41:53 2016 +0000 Translation updates --- src/chrome/locale/ar/aboutTor.dtd | 4 ++-- src/chrome/locale/es/torbutton.dtd | 6 +++--- src/chrome/locale/eu/aboutDialog.dtd | 12 ++++++------ src/chrome/locale/eu/aboutTBUpdate.dtd | 10 +++++----- src/chrome/locale/eu/torbutton.dtd | 12 ++++++------ src/chrome/locale/eu/torbutton.properties | 20 ++++++++++---------- src/chrome/locale/fa/torbutton.properties | 2 +- src/chrome/locale/nl/aboutDialog.dtd | 2 +- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/pt/torbutton.properties | 4 ++-- src/chrome/locale/ru/aboutDialog.dtd | 2 +- src/chrome/locale/ru/aboutTBUpdate.dtd | 6 +++--- src/chrome/locale/ru/aboutTor.dtd | 2 +- src/chrome/locale/ru/brand.dtd | 2 +- src/chrome/locale/vi/aboutTBUpdate.dtd | 2 +- src/chrome/locale/vi/aboutTor.dtd | 2 +- src/chrome/locale/vi/torbutton.dtd | 2 +- src/chrome/locale/zh-CN/aboutDialog.dtd | 2 +- src/chrome/locale/zh-CN/aboutTBUpdate.dtd | 8 ++++---- src/chrome/locale/zh-CN/aboutTor.dtd | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 6 +++--- 21 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 8945674..bf90b4f 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -6,13 +6,13 @@ <!ENTITY aboutTor.title "عن تور"> -<!ENTITY aboutTor.outOfDateTorOn.label "هذا المتصفح خارج التحديث"> +<!ENTITY aboutTor.outOfDateTorOn.label "تحذير: هذه نسخة قديمة من المتصفح."> <!ENTITY aboutTor.outOfDateTorOff.label "أيضاً، هذه نسخة قديمة من المتصفح."> <!ENTITY aboutTor.outOfDate2.label "اضغط على رمز البصلة ثم اختر "تحقق من تحديثات متصفح تور""> <!ENTITY aboutTor.check.label "اختبر إعدادات شبكة تور."> -<!ENTITY aboutTor.success.label "مرحبا بك في متصفح تور"> +<!ENTITY aboutTor.success.label "أهلاً بك في متصفح تور"> <!ENTITY aboutTor.success2.label "تم الإتصال بشبكة تور"> <!ENTITY aboutTor.success3.label "يمكنك الآن تصفح الانترنت بشكل يحمي هويتك."> <!ENTITY aboutTor.failure.label "حدث خطأ ما!"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 40c1270..57f4be5 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -18,7 +18,7 @@ <!ENTITY torbutton.cookiedialog.domainCol "Servidor (host)"> <!ENTITY torbutton.cookiedialog.nameCol "Nombre"> <!ENTITY torbutton.cookiedialog.pathCol "Ruta"> -<!ENTITY torbutton.cookiedialog.protectCookie "Proteger cookie"> +<!ENTITY torbutton.cookiedialog.protectCookie "Cookie protegida"> <!ENTITY torbutton.cookiedialog.removeCookie "Eliminar cookie"> <!ENTITY torbutton.cookiedialog.unprotectCookie "Desproteger cookie"> <!ENTITY torbutton.cookiedialog.removeAllBut "Eliminar todas excepto las protegidas"> @@ -28,7 +28,7 @@ <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegación o datos del sitio web (habilita Modo de Navegación Privada)"> <!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> <!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)"> -<!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios de Navegador Tor"> +<!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios del Navegador Tor"> <!ENTITY torbutton.prefs.sec_caption "Nivel de Seguridad"> <!ENTITY torbutton.prefs.sec_low "Bajo (por defecto)"> <!ENTITY torbutton.prefs.sec_low_usable_desc "Esto proporciona la mejor experiencia de usabilidad."> @@ -37,7 +37,7 @@ <!ENTITY torbutton.prefs.sec_med_low "Medio-Bajo"> <!ENTITY torbutton.prefs.sec_gen_desc "En este nivel de seguridad, se aplican los siguientes cambios (ratón encima para detalles):"> <!ENTITY torbutton.prefs.sec_html5_desc "Los medios de vídeo y audio HTML5 se vuelven tipo clic-para-reproducir mediante NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, podría necesitar usar el botón de barra de herramientas de NoScript para habilitar estos objetos de medios."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "En algunos sitios, podría necesitar usar el botón NoScript de barra de herramientas para habilitar estos objetos de medios."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Algunas optimizaciones de rendimiento de JavaScript están deshabilitadas."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT (compilador JS instantáneo optimizado), Type Inference (deducción del tipo de datos por el compilador), ASM.JS (JS intermedio para alto rendimiento de otros lenguajes)"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT (compilador JS instantáneo)"> diff --git a/src/chrome/locale/eu/aboutDialog.dtd b/src/chrome/locale/eu/aboutDialog.dtd index 93819b7..08f9426 100644 --- a/src/chrome/locale/eu/aboutDialog.dtd +++ b/src/chrome/locale/eu/aboutDialog.dtd @@ -1,19 +1,19 @@ -<!ENTITY project.start "&brandShortName; is developed by "> +<!ENTITY project.start "&brandShortName; garatzen du ">  -<!ENTITY project.tpoLink "the &vendorShortName;"> -<!ENTITY project.end ", a nonprofit working to defend your privacy and freedom online."> +<!ENTITY project.tpoLink "&vendorShortName;"> +<!ENTITY project.end ", irabazi asmorik gabeko eta zure sareko askatasun eta pribatutasuna defendatzen duen erakunde bat."> <!ENTITY help.start "Lagundu nahi duzu?">  <!ENTITY help.donateLink "Egizu dohaintza"> -<!ENTITY help.or " or "> +<!ENTITY help.or "edo">  <!ENTITY help.getInvolvedLink "egizu bat"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Galderarik?">  -<!ENTITY bottomLinks.grow "Help the Tor Network Grow!"> +<!ENTITY bottomLinks.grow "Lagundu Tor sarea hazten!">  <!ENTITY bottomLinks.license "Lizentziei Buruzko Informazioa"> -<!ENTITY tor.TrademarkStatement "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "'Tor' eta 'Onion Logo' Tor Project, Inc.ren marka erregistratuak dira."> diff --git a/src/chrome/locale/eu/aboutTBUpdate.dtd b/src/chrome/locale/eu/aboutTBUpdate.dtd index 37567bd..5f2178b 100644 --- a/src/chrome/locale/eu/aboutTBUpdate.dtd +++ b/src/chrome/locale/eu/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> -<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.title "Tor nabigatzailearen eguneraketa"> +<!ENTITY aboutTBUpdate.updated "Tor nabigatzailea eguneratu egin da."> +<!ENTITY aboutTBUpdate.linkPrefix "Eguneraketa honen inguruko azken informazioa lortzeko,"> +<!ENTITY aboutTBUpdate.linkLabel "ikusi ezazu gure webgunea"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Aldaketen zerrenda:"> diff --git a/src/chrome/locale/eu/torbutton.dtd b/src/chrome/locale/eu/torbutton.dtd index 6ee2509..c92b7f5 100644 --- a/src/chrome/locale/eu/torbutton.dtd +++ b/src/chrome/locale/eu/torbutton.dtd @@ -42,22 +42,22 @@ <!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_jar_desc "Urruneko JAR fitxategiak blokeatuta daude."> +<!ENTITY torbutton.prefs.sec_jar_tooltip "JAR fitxategiak oso bitxiak dira webean, baina XSS eta beste eraso batzuen jatorria izan daitezke."> <!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_mathml_desc_tooltip "MathML ezgaituta dago."> <!ENTITY torbutton.prefs.sec_med_high "Ertaina-altua"> <!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_svg_desc_tooltip "SVG irudiak ezgaituta daude."> <!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_high "Altua"> <!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript is disabled by default on all sites."> <!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_webfonts_desc_tooltip "Webguneak hornitutako letra fitxategiak blokeatuta daude."> <!ENTITY torbutton.prefs.sec_custom "Balio pertsonalizatuak"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Gune honetako Tor zirkuitua"> diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index fcc3b15..0799da2 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -2,10 +2,10 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP ezezaguna torbutton.circuit_display.onion_site = Onion webgunea torbutton.circuit_display.this_browser = Nagibatzaile hau -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = errele torbutton.circuit_display.tor_bridge = Zubia torbutton.circuit_display.unknown_country = Herrialde ezezaguna -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. +torbutton.content_sizer.margin_tooltip = Tor nabigatzaileak marjin hau gehitzen du zure lehioaren zabalera eta altuera ez hain bereizgarria egiteko, horrela norbaitek zure jarraipena egiteko gaitasuna murriztuz. torbutton.panel.tooltip.disabled = Sakatu Tor gaitzeko torbutton.panel.tooltip.enabled = Sakatu Tor ezgaitzeko torbutton.panel.label.disabled = Tor Ezgaitua @@ -26,12 +26,12 @@ torbutton.popup.short_torbrowser = Torbutton informazio garrantzitsua!\n\nTorbut torbutton.popup.confirm_plugins = Flash bezalako pluginek zure pribatutasuna eta anonimotasuna kaltetu dezakete.\n\nTor saltatu dezakete zure uneko kokalekua eta IP helbidea erakusteko.\n\nPluginak gaitu nahi dituzulaz ziur al zaude?\n\n torbutton.popup.never_ask_again = Ez nazazu galdetu berriz -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor nabigatzaileak lehio eta fitxa guztiak itxiko ditu. Webguneen saio guztiak galdutko dira.\n\nTor nabigatzailea orain berrabiarazi zure nortasuna berrezartzeko?\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 = Tipula berdearen menua orain zure segurtasun maila egokitzen uzten dizun barra bat du. Proba ezazu! +torbutton.slider_notification_button = Segurtasun aukerak ireki -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 nabigatzailea maximizatzeak webguneek zure pantailaren neurria zehaztea baimendu dezake, eta zure jarraipena egiteko erabili daiteke. Tor nabigatzailearen lehioa neurri lehenetsian uztea gomendatzen dugu. # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Webgune hau (% S) HTML5 canvas irudi datuak ateratzen saiatu da, eta zure ordenagailua identifikatzeko erabil daitezke.\n\nTor Nabigatzailea baimendu nahi duzu webgune honetan HTML5 canvas irudiaren datuak ateratzeko? @@ -45,7 +45,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 Profilarekin Arazoa -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileReadOnly=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi sistema batetik. Mesedez kopiatu ezazu %S beste leku batean erabiltzen saiatu baino lehenago. +profileReadOnlyMac=Ezin duzu %S exekutatu irakurtzeko soilik den fitxategi sistema batetik. Mesedez kopiatu %S zure mahaigain edo aplikazioen karpetara erabiltzen saiatu baino lehenago. +profileAccessDenied=%S ez du profilera sartzeko baimenik. Mesedez egokitu itzazu zure fitxategi sistemaren baimenak eta berriz saiatu. +profileMigrationFailed=Zure %S profilaren migrazioak huts egin du.\nEzarpen berriak erabiliko dira. diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 9f77531..d809651 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -48,4 +48,4 @@ profileProblemTitle=%S مشکل پروفایل profileReadOnly=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به محل دیگری قبل از تلاش برای استفاده از آن. profileReadOnlyMac=شما نمی توانید اجرا %S از یک فایل سیستم فقط خواندنی. لطفا کپی کنید %S به دسکتاپ خودتان یا پوشه برنامه قبل از تلاش برای استفاده از آن. profileAccessDenied=٪ S اجازه دسترسی به مشخصات ندارد. لطفا مجوزهای سیستم فایل خود را تنظیم و دوباره سعی کنید. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=مهاجرت ناموفق از پروفایل %S.\nتنظیمات جدید استفاده خواهد شد. diff --git a/src/chrome/locale/nl/aboutDialog.dtd b/src/chrome/locale/nl/aboutDialog.dtd index 028e122..33e7e78 100644 --- a/src/chrome/locale/nl/aboutDialog.dtd +++ b/src/chrome/locale/nl/aboutDialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink "het &vendorShortName;"> <!ENTITY project.end ", een non-profit die zich inzet om uw privacy en vrijheid online te verdedigen."> -<!ENTITY help.start "Wilt u meehelpen?"> +<!ENTITY help.start "Wil je meehelpen?">  <!ENTITY help.donateLink "Doneer"> <!ENTITY help.or "of"> diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index e5c2b3a..66ae979 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -37,7 +37,7 @@ <!ENTITY torbutton.prefs.sec_med_low "Medium-Laag"> <!ENTITY torbutton.prefs.sec_gen_desc "Op dit beveiligingsniveau gelden de volgende wijzigingen (beweeg de muis over de items voor meer informatie)"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 video en audio media geworden click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites , zou je de NoScript werkbalk knop moeten gebruiken om deze media -objecten mogelijk te maken."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "Op sommige sites zou je de NoScript werkbalk knop moeten gebruiken om deze media -objecten mogelijk te maken."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Sommige JavaScript-prestatieverbeteringen zijn uitgeschakeld."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Type Inference, ASM.JS."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 2c1e704..658c96e 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -21,10 +21,10 @@ torbutton.popup.dontask = A partir de agora, transferir automaticamente os fiche torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versão em inglês em páginas da Internet. Isto pode causar a visualização em inglês das páginas que prefere ler em português.\n\nPretende visualizar páginas em inglês, para melhor privacidade? torbutton.popup.no_newnym = O Torbutton não pode, em segurança, fornecer-lhe uma nova identidade. Não tem acesso à porta de controle Tor.\n\nEstá a usar o Tor Browser Bundle? torbutton.title.prompt_torbrowser = Informação Importante do Torbutton -torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não pode desligá-lo.\n\nProcedemos a esta alteração porque não é seguro usar o Torbutton num explorador também usado para buscas fora do Tor. Havia demasiados erros que não conseguimos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox normalmente, deve desinstalar o Torbutton e carregar o Tor Browser Bundle para o seu computador. As políticas de privacidade do Explorador do Tor também são superiores às normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton abra Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton. +torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não o poderá desligar.\n\nEfetuámos alteração porque não é seguro usar o Torbutton num navegador também usado para navegação não Tor. Havia demasiados erros que não conseguiríamos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox, deve desinstalar o Torbutton e descarregar o Tor Browser Bundle para o seu computador. As políticas de privacidade do Navegador Tor também são superiores às normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton, aceda a Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton. torbutton.popup.short_torbrowser = Informação importante do Torbutton!\nO Torbutton não está sempre activo.\nClique no Torbutton para mais informação. -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n +torbutton.popup.confirm_plugins = Os plugins tais como o Flash podem invadir a sua privacidade.\n\nTambém podem originar que o Tor revele a sua localização e o seu endereço IP.\n\nTem a certeza de que deseja ativar os plugins?\n\n 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 diff --git a/src/chrome/locale/ru/aboutDialog.dtd b/src/chrome/locale/ru/aboutDialog.dtd index 19b96a0..2ea0395 100644 --- a/src/chrome/locale/ru/aboutDialog.dtd +++ b/src/chrome/locale/ru/aboutDialog.dtd @@ -1,4 +1,4 @@ -<!ENTITY project.start "&brandShortName; разработано"> +<!ENTITY project.start "&brandShortName; разработки">  <!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end ", проект, созданный, чтобы защитить вашу конфиденциальность и свободу в сети."> diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd index da0a7c3..21221ac 100644 --- a/src/chrome/locale/ru/aboutTBUpdate.dtd +++ b/src/chrome/locale/ru/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Обновление браузера Tor"> -<!ENTITY aboutTBUpdate.updated "Браузер Tor был обновлен."> -<!ENTITY aboutTBUpdate.linkPrefix "Для наиболее актуальной информации об этом выпуске,"> +<!ENTITY aboutTBUpdate.updated "Браузер Tor обновлён."> +<!ENTITY aboutTBUpdate.linkPrefix "Чтобы получить наиболее свежую информацию об этом выпуске,"> <!ENTITY aboutTBUpdate.linkLabel "посетите наш вебсайт"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Список изменений:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Журнал изменений:"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index f2ea375..bcc257a 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -13,7 +13,7 @@ <!ENTITY aboutTor.check.label "Проверить настройки сети Tor"> <!ENTITY aboutTor.success.label "Добро пожаловать в обозреватель Tor"> -<!ENTITY aboutTor.success2.label "Соединены с сетью Tor"> +<!ENTITY aboutTor.success2.label "Вы подключены к сети Tor."> <!ENTITY aboutTor.success3.label "Теперь Вы можете просматривать интернет-сайты в анонимном режиме."> <!ENTITY aboutTor.failure.label "Что-то пошло не так!"> <!ENTITY aboutTor.failure2.label "Tor не работает в этом браузере."> diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd index 416dcd8..e7e0a5e 100644 --- a/src/chrome/locale/ru/brand.dtd +++ b/src/chrome/locale/ru/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor Browser"> +<!ENTITY brandShorterName "Браузер Tor"> <!ENTITY brandShortName "Tor Browser"> <!ENTITY brandFullName "Tor Browser"> <!ENTITY vendorShortName "Проект Tor"> diff --git a/src/chrome/locale/vi/aboutTBUpdate.dtd b/src/chrome/locale/vi/aboutTBUpdate.dtd index 37567bd..4f0a9d4 100644 --- a/src/chrome/locale/vi/aboutTBUpdate.dtd +++ b/src/chrome/locale/vi/aboutTBUpdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.title "Cập nhật về Trình duyệt Tor"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> <!ENTITY aboutTBUpdate.linkLabel "visit our website"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 3ab6a1b..8a349b5 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Thông tin về Tor"> <!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "Ngoài ra, trình duyệt này đã lỗi thời."> +<!ENTITY aboutTor.outOfDateTorOff.label "Thêm nữa, trình duyệt này đã lỗi thời."> <!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> <!ENTITY aboutTor.check.label "Test Tor Network Settings"> diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd index 92c1120..d4157be 100644 --- a/src/chrome/locale/vi/torbutton.dtd +++ b/src/chrome/locale/vi/torbutton.dtd @@ -1,4 +1,4 @@ -<!ENTITY torbutton.context_menu.new_identity "Giám định Mới"> +<!ENTITY torbutton.context_menu.new_identity "Định danh mới"> <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Vòng Tor mới cho trang này"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> diff --git a/src/chrome/locale/zh-CN/aboutDialog.dtd b/src/chrome/locale/zh-CN/aboutDialog.dtd index 2b2bbf7..0f6da79 100644 --- a/src/chrome/locale/zh-CN/aboutDialog.dtd +++ b/src/chrome/locale/zh-CN/aboutDialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink "&vendorShortName;"> <!ENTITY project.end "，一个捍卫您的隐私和自由上网权的非营利组织。"> -<!ENTITY help.start "想要提供帮助？"> +<!ENTITY help.start "需要得到帮助？">  <!ENTITY help.donateLink "捐款"> <!ENTITY help.or "或者"> diff --git a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd index d5caea9..416ddae 100644 --- a/src/chrome/locale/zh-CN/aboutTBUpdate.dtd +++ b/src/chrome/locale/zh-CN/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser 更新"> -<!ENTITY aboutTBUpdate.updated "Tor Browser 已更新。"> +<!ENTITY aboutTBUpdate.title "更新 Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Tor Browser 更新完成。"> <!ENTITY aboutTBUpdate.linkPrefix "有关此版本的最新信息，"> -<!ENTITY aboutTBUpdate.linkLabel "请访问我们的网站"> +<!ENTITY aboutTBUpdate.linkLabel "访问我们的网站"> <!ENTITY aboutTBUpdate.linkSuffix "。"> -<!ENTITY aboutTBUpdate.changeLogHeading "变更日志："> +<!ENTITY aboutTBUpdate.changeLogHeading "更新日志："> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 4d02c9b..426ec5e 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "关于 Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "警告：此浏览器版本较旧。"> +<!ENTITY aboutTor.outOfDateTorOn.label "警告：此浏览器版本过旧。"> <!ENTITY aboutTor.outOfDateTorOff.label "另外，该浏览器并非最新版本。"> <!ENTITY aboutTor.outOfDate2.label "点击洋葱图标，然后选择“Tor Browser 检查更新”。"> diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 58f72fb..3146ce3 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -15,7 +15,7 @@ <!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> -<!ENTITY torbutton.cookiedialog.domainCol "服务器"> +<!ENTITY torbutton.cookiedialog.domainCol "主机"> <!ENTITY torbutton.cookiedialog.nameCol "名称"> <!ENTITY torbutton.cookiedialog.pathCol "路径"> <!ENTITY torbutton.cookiedialog.protectCookie "保护 Cookie"> @@ -35,13 +35,13 @@ <!ENTITY torbutton.prefs.sec_low_desc "该安全级别将启用所有浏览器功能。"> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "禁用 SVG OpenType 字体渲染功能。"> <!ENTITY torbutton.prefs.sec_med_low "中低"> -<!ENTITY torbutton.prefs.sec_gen_desc "该安全级别设置如下（光标悬停查看更多信息）："> +<!ENTITY torbutton.prefs.sec_gen_desc "在这个安全级别，下列更改将会生效（鼠标悬停查看细节）："> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT、类型推断、ASM.JS。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本执行变慢。"> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会暂缓执行。"> <!ENTITY torbutton.prefs.sec_jar_desc "禁用远程 JAR 文件。"> <!ENTITY torbutton.prefs.sec_jar_tooltip "网站上很少出现 JAR 文件，但可能成为 XSS 及其他攻击的源头。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。">

1 0

[torbutton/master] Bug 14271: Make Torbutton work with Unix Domain Socket option
by gk＠torproject.org 09 Sep '16

09 Sep '16

commit 28a55f5bf324f43373006328c5b03793096f71c4 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 9 11:53:23 2016 -0400 Bug 14271: Make Torbutton work with Unix Domain Socket option Call Tor Launcher's new TorGetControlSocketFile() function to determine if a Unix domain socket is being used for Tor control port communication and, if it is, use it instead of a TCP connection. --- src/chrome/content/tor-circuit-display.js | 20 +++--- src/chrome/content/torbutton.js | 101 +++++++++++++++++++----------- src/modules/tor-control-port.js | 82 +++++++++++++----------- 3 files changed, 124 insertions(+), 79 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index c99d25d..f1cf2aa 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -5,9 +5,10 @@ // call earlier functions). The file can be processed // with docco.js to produce pretty documentation. // -// This script is to be embedded in torbutton.xul. It defines a single global function, -// runTorCircuitDisplay(host, port, password), which activates the automatic Tor -// circuit display for the current tab and any future tabs. +// This script is to be embedded in torbutton.xul. It defines a single global +// function, createTorCircuitDisplay(socketFile, host, port, password), which +// activates the automatic Tor circuit display for the current tab and any +// future tabs. // // See https://trac.torproject.org/8641 @@ -15,10 +16,10 @@ /* global document, gBrowser, Components */ // ### Main function -// __createTorCircuitDisplay(host, port, password, enablePrefName)__. +// __createTorCircuitDisplay(socketFile, host, port, password, enablePrefName)__. // The single function that prepares tor circuit display. Connects to a tor -// control port with the given host, port, and password, and binds to -// a named bool pref whose value determines whether the circuit display +// control port with the given socketFile or host plus port, and password, and +// binds to a named bool pref whose value determines whether the circuit display // is enabled or disabled. let createTorCircuitDisplay = (function () { @@ -311,11 +312,11 @@ let syncDisplayWithSelectedTab = (function() { // ## Main function -// __setupDisplay(host, port, password, enablePrefName)__. +// __setupDisplay(socketFile, host, port, password, enablePrefName)__. // Once called, the Tor circuit display will be started whenever // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. -let setupDisplay = function (host, port, password, enablePrefName) { +let setupDisplay = function (socketFile, host, port, password, enablePrefName) { let myController = null, stopCollectingIsolationData = null, stop = function() { @@ -329,7 +330,8 @@ let setupDisplay = function (host, port, password, enablePrefName) { }, start = function () { if (!myController) { - myController = controller(host, port || 9151, password, function (err) { + myController = controller(socketFile, host, port || 9151, password, + function (err) { // An error has occurred. logger.eclog(5, err); logger.eclog(5, "Disabling tor display circuit because of an error."); diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index acb4b4b..bdcbc4d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -31,9 +31,11 @@ var m_tb_window_width = window.outerWidth; var m_tb_tbb = false; -var m_tb_control_port = null; -var m_tb_control_host = null; +var m_tb_control_socket_file = null; // Set if using a UNIX domain socket. +var m_tb_control_port = null; // Set if not using a socket. +var m_tb_control_host = null; // Set if not using a socket. var m_tb_control_pass = null; +var m_tb_control_desc = null; // For logging. var m_tb_orig_BrowserOnAboutPageLoad = null; @@ -314,6 +316,12 @@ function torbutton_init() { m_tb_prefs.setCharPref(k_tb_last_browser_version_pref, cur_version); } + let tlps; + try { + tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] + .getService(Ci.nsISupports).wrappedJSObject; + } catch(e) {} + // Bug 1506 P4: These vars are very important for New Identity var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); @@ -329,33 +337,48 @@ function torbutton_init() { } catch(e) { torbutton_log(4, 'unable to read authentication cookie'); } - } else { + } else try { // Try to get password from Tor Launcher. - try { - let tlps = Cc["@torproject.org/torlauncher-protocol-service;1"] - .getService(Ci.nsISupports).wrappedJSObject; - m_tb_control_pass = tlps.TorGetPassword(false); - } catch(e) {} - } + m_tb_control_pass = tlps.TorGetPassword(false); + } catch(e) {} - if (environ.exists("TOR_CONTROL_PORT")) { - m_tb_control_port = environ.get("TOR_CONTROL_PORT"); - } else { - try { - const kTLControlPortPref = "extensions.torlauncher.control_port"; - m_tb_control_port = m_tb_prefs.getIntPref(kTLControlPortPref); - } catch(e) {} - } + // Try to get control port socket (an nsIFile) from Tor Launcher, since + // Tor Launcher knows how to handle its own preferences and how to + // resolve relative paths. + try { + m_tb_control_socket_file = tlps.TorGetControlSocketFile(); + } catch(e) {} - if (environ.exists("TOR_CONTROL_HOST")) { - m_tb_control_host = environ.get("TOR_CONTROL_HOST"); + if (m_tb_control_socket_file) { + m_tb_control_desc = m_tb_control_socket_file.path; } else { - try { - const kTLControlHostPref = "extensions.torlauncher.control_host"; - m_tb_control_host = m_tb_prefs.getCharPref(kTLControlHostPref); - } catch(e) { - m_tb_control_host = "127.0.0.1"; - } + if (environ.exists("TOR_CONTROL_PORT")) { + m_tb_control_port = environ.get("TOR_CONTROL_PORT"); + } else { + try { + const kTLControlPortPref = "extensions.torlauncher.control_port"; + m_tb_control_port = m_tb_prefs.getIntPref(kTLControlPortPref); + } catch(e) { + // Since we want to disable some features when Tor Launcher is + // not installed (e.g., New Identity), we do not set a default + // port value here. + } + } + + if (m_tb_control_port) { + m_tb_control_desc = "" + m_tb_control_port; + } + + if (environ.exists("TOR_CONTROL_HOST")) { + m_tb_control_host = environ.get("TOR_CONTROL_HOST"); + } else { + try { + const kTLControlHostPref = "extensions.torlauncher.control_host"; + m_tb_control_host = m_tb_prefs.getCharPref(kTLControlHostPref); + } catch(e) { + m_tb_control_host = "127.0.0.1"; + } + } } // Add event listener for about:tor page loads. @@ -430,7 +453,8 @@ function torbutton_init() { torbutton_notify_if_update_needed(); torbutton_update_sync_ui(); - createTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass, + createTorCircuitDisplay(m_tb_control_socket_file, m_tb_control_host, + m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); torbutton_log(3, 'init completed'); @@ -999,9 +1023,15 @@ function torbutton_send_ctrl_cmd(command) { m_tb_domWindowUtils.suppressEventHandling(false); try { - var socketTransportService = Components.classes["@mozilla.org/network/socket-transport-service;1"] - .getService(Components.interfaces.nsISocketTransportService); - var socket = socketTransportService.createTransport(null, 0, m_tb_control_host, m_tb_control_port, null); + let sts = Cc["@mozilla.org/network/socket-transport-service;1"] + .getService(Ci.nsISocketTransportService); + let socket; + if (m_tb_control_socket_file) { + socket = sts.createUnixDomainTransport(m_tb_control_socket_file); + } else { + socket = sts.createTransport(null, 0, m_tb_control_host, + m_tb_control_port, null); + } // If we don't get a response from the control port in 2 seconds, someting is wrong.. socket.setTimeout(Ci.nsISocketTransport.TIMEOUT_READ_WRITE, 2); @@ -1021,21 +1051,21 @@ function torbutton_send_ctrl_cmd(command) { var bytes = torbutton_socket_readline(inputStream); if (bytes.indexOf("250") != 0) { - torbutton_safelog(4, "Unexpected auth response on control port "+m_tb_control_port+":", bytes); + torbutton_safelog(4, "Unexpected auth response on control port "+m_tb_control_desc+":", bytes); return null; } outputStream.writeBytes(command, command.length); bytes = torbutton_socket_readline(inputStream); if(bytes.indexOf("250") != 0) { - torbutton_safelog(4, "Unexpected command response on control port "+m_tb_control_port+":", bytes); + torbutton_safelog(4, "Unexpected command response on control port "+m_tb_control_desc+":", bytes); return null; } // Closing these streams prevents a shutdown hang on Mac OS. See bug 10201. inputStream.close(); outputStream.close(); - socket.close(Components.results.NS_OK); + socket.close(Cr.NS_OK); return bytes.substr(4); } catch(e) { torbutton_log(4, "Exception on control port "+e); @@ -1339,7 +1369,7 @@ function torbutton_do_new_identity() { torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym. - if (!m_tb_control_pass || !m_tb_control_port) { + if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { var warning = torbutton_get_property_string("torbutton.popup.no_newnym"); torbutton_log(5, "Torbutton cannot safely newnym. It does not have access to the Tor Control Port."); window.alert(warning); @@ -1497,7 +1527,7 @@ function torbutton_do_tor_check() const kEnvUseTransparentProxy = "TOR_TRANSPROXY"; var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); - if (m_tb_control_port && + if ((m_tb_control_socket_file || m_tb_control_port) && !env.exists(kEnvUseTransparentProxy) && !env.exists(kEnvSkipControlPortTest) && m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { @@ -2096,8 +2126,9 @@ function torbutton_check_protections() // See https://trac.torproject.org/projects/tor/ticket/10353 for more info. document.getElementById("torbutton-cookie-protector").hidden = m_tb_prefs.getBoolPref("extensions.torbutton.block_disk"); - if (!m_tb_control_pass || !m_tb_control_port) + if (!m_tb_control_pass || (!m_tb_control_socket_file && !m_tb_control_port)) { document.getElementById("torbutton-new-identity").disabled = true; + } if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { torbutton_inform_about_tbb(); diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 63c2cd9..f23daed 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -7,9 +7,10 @@ // // To import the module, use // -// let { controller } = Components.utils.import("path/to/controlPort.jsm"); +// let { controller } = Components.utils.import("path/to/tor-control-port.js"); // -// See the last function defined in this file, controller(host, port, password, onError) +// See the last function defined in this file: +// controller(socketFile, host, port, password, onError) // for usage of the controller function. /* jshint esnext: true */ @@ -41,17 +42,24 @@ log("Loading tor-control-port.js\n"); // I/O utilities namespace let io = {}; -// __io.asyncSocketStreams(host, port)__. +// __io.asyncSocketStreams(socketFile, host, port)__. // Creates a pair of asynchronous input and output streams for a socket at the -// given host and port. -io.asyncSocketStreams = function (host, port) { - let socketTransportService = Cc["@mozilla.org/network/socket-transport-service;1"] - .getService(Components.interfaces.nsISocketTransportService), - UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED, - // Create an instance of a socket transport. - socketTransport = socketTransportService.createTransport(null, 0, host, port, null), - // Open unbuffered asynchronous outputStream. - outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1) +// given socketFile or host and port. +io.asyncSocketStreams = function (socketFile, host, port) { + let sts = Cc["@mozilla.org/network/socket-transport-service;1"] + .getService(Components.interfaces.nsISocketTransportService), + UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED; + + // Create an instance of a socket transport. + let socketTransport; + if (socketFile) { + socketTransport = sts.createUnixDomainTransport(socketFile); + } else { + socketTransport = sts.createTransport(null, 0, host, port, null); + } + + // Open unbuffered asynchronous outputStream. + let outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1) .QueryInterface(Ci.nsIAsyncOutputStream), // Open unbuffered asynchronous inputStream. inputStream = socketTransport.openInputStream(UNBUFFERED, 1, 1) @@ -91,14 +99,16 @@ io.pumpInputStream = function (inputStream, onInputData, onError) { } }, null); }; -// __io.asyncSocket(host, port, onInputData, onError)__. -// Creates an asynchronous, text-oriented TCP socket at host:port. +// __io.asyncSocket(socketFile, host, port, onInputData, onError)__. +// Creates an asynchronous, text-oriented UNIX domain socket (if socketFile +// is defined) or TCP socket at host:port. // The onInputData callback should accept a single argument, which will be called // repeatedly, whenever incoming text arrives. Returns a socket object with two methods: // socket.write(text) and socket.close(). onError will be passed the error object // whenever a write fails. -io.asyncSocket = function (host, port, onInputData, onError) { - let [inputStream, outputStream] = io.asyncSocketStreams(host, port), +io.asyncSocket = function (socketFile, host, port, onInputData, onError) { + let [inputStream, outputStream] = io.asyncSocketStreams(socketFile, host, + port), pendingWrites = []; // Run an input stream pump to send incoming data to the onInputData callback. io.pumpInputStream(inputStream, onInputData, onError); @@ -243,13 +253,13 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { }); }; -// __io.controlSocket(host, port, password, onError)__. -// Instantiates and returns a socket to a tor ControlPort at host:port, -// authenticating with the given password. onError is called with an +// __io.controlSocket(socketFile, host, port, password, onError)__. +// Instantiates and returns a socket to a tor ControlPort at socketFile or +// host:port, authenticating with the given password. onError is called with an // error object as its single argument whenever an error occurs. Example: // // // Open the socket -// let socket = controlSocket("127.0.0.1", 9151, "MyPassw0rd", +// let socket = controlSocket(undefined, "127.0.0.1", 9151, "MyPassw0rd", // function (error) { console.log(error.message || error); }); // // Send command and receive "250" reply or error message // socket.sendCommand(commandText, replyCallback, errorCallback); @@ -259,11 +269,11 @@ io.matchRepliesToCommands = function (asyncSend, dispatcher) { // socket.removeNotificationCallback(callback); // // Close the socket permanently // socket.close(); -io.controlSocket = function (host, port, password, onError) { +io.controlSocket = function (socketFile, host, port, password, onError) { // Produce a callback dispatcher for Tor messages. let mainDispatcher = io.callbackDispatcher(), // Open the socket and convert format to Tor messages. - socket = io.asyncSocket(host, port, + socket = io.asyncSocket(socketFile, host, port, io.onDataFromOnLine( io.onLineFromOnMessage(mainDispatcher.pushMessage)), onError), @@ -606,15 +616,16 @@ event.watchEvent = function (controlSocket, type, filter, onData) { let tor = {}; // __tor.controllerCache__. -// A map from "host:port" to controller objects. Prevents redundant instantiation -// of control sockets. +// A map from "unix:socketpath" or "host:port" to controller objects. Prevents +// redundant instantiation of control sockets. tor.controllerCache = {}; -// __tor.controller(host, port, password, onError)__. -// Creates a tor controller at the given host and port, with the given password. +// __tor.controller(socketFile, host, port, password, onError)__. +// Creates a tor controller at the given socketFile or host and port, with the +// given password. // onError returns asynchronously whenever a connection error occurs. -tor.controller = function (host, port, password, onError) { - let socket = io.controlSocket(host, port, password, onError), +tor.controller = function (socketFile, host, port, password, onError) { + let socket = io.controlSocket(socketFile, host, port, password, onError), isOpen = true; return { getInfo : key => info.getInfo(socket, key), getConf : key => info.getConf(socket, key), @@ -627,27 +638,28 @@ tor.controller = function (host, port, password, onError) { // ## Export -// __controller(host, port, password, onError)__. +// __controller(socketFile, host, port, password, onError)__. // Instantiates and returns a controller object connected to a tor ControlPort -// at host:port, authenticating with the given password, if the controller doesn't yet -// exist. Otherwise returns the existing controller to the given host:port. +// on socketFile or at host:port, authenticating with the given password, if +// the controller doesn't yet exist. Otherwise returns the existing controller +// to the given socketFile or host:port. // onError is called with an error object as its single argument whenever // an error occurs. Example: // // // Get the controller -// let c = controller("127.0.0.1", 9151, "MyPassw0rd", +// let c = controller(undefined, "127.0.0.1", 9151, "MyPassw0rd", // function (error) { console.log(error.message || error); }); // // Send command and receive `250` reply or error message in a promise: // let replyPromise = c.getInfo("ip-to-country/16.16.16.16"); // // Close the controller permanently // c.close(); -var controller = function (host, port, password, onError) { - let dest = host + ":" + port, +var controller = function (socketFile, host, port, password, onError) { + let dest = (socketFile) ? "unix:" + socketFile.path : host + ":" + port, maybeController = tor.controllerCache[dest]; return (tor.controllerCache[dest] = (maybeController && maybeController.isOpen()) ? maybeController : - tor.controller(host, port, password, onError)); + tor.controller(socketFile, host, port, password, onError)); }; // Export the controller function for external use.

1 0