- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update NoScript.
by gk＠torproject.org 05 May '14

05 May '14

commit effeeb3f659950df6aa8f486d22d5d4e3dd883bf Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 5 09:51:00 2014 +0000 Update NoScript. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.beta | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2ce07b1..7ad5f87 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,7 @@ Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms * Update HTTPS-Everywhere to 3.5.1 + * Update NoScript to 2.6.8.22 * Bug 11658: Fix proxy configuration for non-Pluggable Transports users * Backport Pending Tor Patches: * Bug 8402: Allow Tor proxy configuration while PTs are present diff --git a/gitian/versions.beta b/gitian/versions.beta index 2a92957..c3faa7b 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -43,7 +43,7 @@ HTTPSE_VER=3.5.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -70,7 +70,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[tor-browser-bundle/master] Update changelog for 3.6.1.
by mikeperry＠torproject.org 03 May '14

03 May '14

commit c6de6b29322dd1e928f181f18046cbf3d0ed921e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat May 3 10:04:42 2014 -0700 Update changelog for 3.6.1. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e7d5178..2ce07b1 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,12 @@ +Tor Browser Bundle 3.6.1 -- May 6 2014 + * All Platforms + * Update HTTPS-Everywhere to 3.5.1 + * Bug 11658: Fix proxy configuration for non-Pluggable Transports users + * Backport Pending Tor Patches: + * Bug 8402: Allow Tor proxy configuration while PTs are present + * Note: The Pluggable Transports themselves have not been updated to + support proxy configuration yet. + Tor Browser Bundle 3.6 -- Apr 29 2014 * All Platforms * Update Firefox to 24.5.0esr

1 0

[tor-browser-bundle/master] Bump version to 3.6.1 and pin FTE to a specific hash.
by mikeperry＠torproject.org 03 May '14

03 May '14

commit 797f967eb5d27f0c7b5703961344d391e66d7fe0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat May 3 10:03:01 2014 -0700 Bump version to 3.6.1 and pin FTE to a specific hash. FTE's tags are unsigned, so we have to use commit hashes. --- gitian/versions.beta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.beta b/gitian/versions.beta index b5cfa53..2a92957 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6 +TORBROWSER_VERSION=3.6.1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -18,7 +18,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 -FTEPROXY_TAG=0.2.13 +FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Add stopgap for shipping HTTPS-Everywhere.
by gk＠torproject.org 02 May '14

02 May '14

commit 35411af55b92ee4d1c823aaefc5a5062ac940787 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 2 09:17:54 2014 +0000 Add stopgap for shipping HTTPS-Everywhere. Until bug 11630 is fixed we add a better stopgap than shipping outdated HTTPS-Everywhere versions: we take the NoScript route and download and use the .xpi made by the EFF. --- gitian/descriptors/linux/gitian-bundle.yml | 11 ++++++----- gitian/descriptors/mac/gitian-bundle.yml | 11 ++++++----- gitian/descriptors/windows/gitian-bundle.yml | 11 ++++++----- gitian/fetch-inputs.sh | 6 ++++-- gitian/versions.beta | 4 ++++ gitian/versions.nightly | 4 ++++ 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index c16589a..006883c 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" @@ -88,13 +89,13 @@ script: | ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ cd tor-browser/Data/Browser/profile.default/extensions diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 263ca57..2668c7d 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "ddmg.sh" - "libdmg.patch" @@ -95,13 +96,13 @@ script: | ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + # cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + # rm -f .git/refs/heads/master + # ./makexpi.sh + # cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + # cd .. # cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 457fa7b..ebde49b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -37,6 +37,7 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" @@ -78,13 +79,13 @@ script: | ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index f80348e..b542cf0 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -206,8 +206,9 @@ done cd .. -# NoScript and PDF.JS are magikal and special: +# NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} +wget -U "" -N ${HTTPSE_URL} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; @@ -226,7 +227,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -262,6 +263,7 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$HTTPSE_PACKAGE" https-everywhere(a)eff.org.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 diff --git a/gitian/versions.beta b/gitian/versions.beta index 3460248..b5cfa53 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -38,11 +38,13 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +HTTPSE_VER=3.5.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -69,6 +71,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -89,6 +92,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c8a8d7c..355b68a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -39,11 +39,13 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +HTTPSE_VER=3.5.1 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -70,6 +72,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -90,6 +93,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC…

1 0

[tor-browser-bundle/master] Bug 11658: Add support for proxies while PT lines are present.
by mikeperry＠torproject.org 01 May '14

01 May '14

commit 1a94be0a770084b61d87bf6da4f9563cfac236ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 1 12:32:43 2014 -0700 Bug 11658: Add support for proxies while PT lines are present. This technically backports Bug 8402's patch, which will allow proxies to work without PTs again. However, PT+Proxies remain unsupported until we bump obfs3 to 0.2.9 and solve bug #11535. Flashproxy and FTE may need similar bumps+tweaks to fully solve bug #8402. --- gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug8402.patch | 437 +++++++++++++++++++++++++++++ 4 files changed, 443 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 826d355..8b1644e 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug11200.patch" - "bug11069.patch" - "bug9665.patch" +- "bug8402.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -79,6 +80,7 @@ script: | git am ~/build/bug11156.patch git am ~/build/bug9665.patch git am ~/build/bug11200.patch + git am ~/build/bug8402.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c3ae8d8..ca938fc 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -32,6 +32,7 @@ files: - "bug11200.patch" - "bug11069.patch" - "bug9665.patch" +- "bug8402.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -110,6 +111,7 @@ script: | git am ~/build/bug11156.patch git am ~/build/bug9665.patch git am ~/build/bug11200.patch + git am ~/build/bug8402.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 5e452b9..61fc9b5 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -31,6 +31,7 @@ files: - "bug11200.patch" - "bug11069.patch" - "bug9665.patch" +- "bug8402.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -106,6 +107,7 @@ script: | git am ~/build/bug11156.patch git am ~/build/bug9665.patch git am ~/build/bug11200.patch + git am ~/build/bug8402.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/patches/bug8402.patch b/gitian/patches/bug8402.patch new file mode 100644 index 0000000..2aa74c6 --- /dev/null +++ b/gitian/patches/bug8402.patch @@ -0,0 +1,437 @@ +From 88ddabbce1e15627f51b1bd6aef06f1b3515dd15 Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Thu, 1 May 2014 03:57:29 +0000 +Subject: [PATCH 1/2] Allow ClientTransportPlugins to use proxies + +This change allows using Socks4Proxy, Socks5Proxy and HTTPSProxy with +ClientTransportPlugins via the TOR_PT_PROXY extension to the +pluggable transport specification. + +This fixes bug #8402. + +WARNING: + +This is a backport to tor-0.2.4.x of a unmerged patch. Differences +at the time of writing from my real branch are: + * Unit tests. + * get_proxy_type() is removed in the backport, 0.2.5.x uses the + routine elsewhere, so it is left intact (with modifications). +--- + src/or/config.c | 24 +++++++---- + src/or/connection.c | 55 ++++++++++--------------- + src/or/transports.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++-- + src/or/transports.h | 3 ++ + 4 files changed, 152 insertions(+), 44 deletions(-) + +diff --git a/src/or/config.c b/src/or/config.c +index 09fdc0c..3fe5b73 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -490,7 +490,9 @@ static int options_transition_affects_descriptor( + static int check_nickname_list(const char *lst, const char *name, char **msg); + + static int parse_bridge_line(const char *line, int validate_only); +-static int parse_client_transport_line(const char *line, int validate_only); ++static int parse_client_transport_line(const or_options_t *options, ++ const char *line, ++ int validate_only); + + static int parse_server_transport_line(const char *line, int validate_only); + static char *get_bindaddr_from_transport_listen_line(const char *line, +@@ -1337,7 +1339,7 @@ options_act(const or_options_t *old_options) + pt_prepare_proxy_list_for_config_read(); + if (options->ClientTransportPlugin) { + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { +- if (parse_client_transport_line(cl->value, 0)<0) { ++ if (parse_client_transport_line(options, cl->value, 0)<0) { + log_warn(LD_BUG, + "Previously validated ClientTransportPlugin line " + "could not be added!"); +@@ -2954,11 +2956,11 @@ options_validate(or_options_t *old_options, or_options_t *options, + } + } + +- /* Check if more than one proxy type has been enabled. */ ++ /* Check if more than one exclusive proxy type has been enabled. */ + if (!!options->Socks4Proxy + !!options->Socks5Proxy + +- !!options->HTTPSProxy + !!options->ClientTransportPlugin > 1) ++ !!options->HTTPSProxy > 1) + REJECT("You have configured more than one proxy type. " +- "(Socks4Proxy|Socks5Proxy|HTTPSProxy|ClientTransportPlugin)"); ++ "(Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + + /* Check if the proxies will give surprising behavior. */ + if (options->HTTPProxy && !(options->Socks4Proxy || +@@ -3073,7 +3075,7 @@ options_validate(or_options_t *old_options, or_options_t *options, + } + + for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { +- if (parse_client_transport_line(cl->value, 1)<0) ++ if (parse_client_transport_line(options, cl->value, 1)<0) + REJECT("Transport line did not parse. See logs for details."); + } + +@@ -4229,7 +4231,8 @@ parse_bridge_line(const char *line, int validate_only) + * our internal transport list. + * - If it's a managed proxy line, launch the managed proxy. */ + static int +-parse_client_transport_line(const char *line, int validate_only) ++parse_client_transport_line(const or_options_t *options, const char *line, ++ int validate_only) + { + smartlist_t *items = NULL; + int r; +@@ -4308,6 +4311,13 @@ parse_client_transport_line(const char *line, int validate_only) + pt_kickstart_client_proxy(transport_list, proxy_argv); + } + } else { /* external */ ++ /* ClientTransportPlugins connecting through a proxy is managed only. */ ++ if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) { ++ log_warn(LD_CONFIG, "You have configured an external proxy with another " ++ "proxy type. (Socks4Proxy|Socks5Proxy|HTTPSProxy)"); ++ goto err; ++ } ++ + if (smartlist_len(transport_list) != 1) { + log_warn(LD_CONFIG, "You can't have an external proxy with " + "more than one transports."); +diff --git a/src/or/connection.c b/src/or/connection.c +index 4f74a1d..683cf46 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -81,7 +81,6 @@ static const char *connection_proxy_state_to_string(int state); + static int connection_read_https_proxy_response(connection_t *conn); + static void connection_send_socks5_connect(connection_t *conn); + static const char *proxy_type_to_string(int proxy_type); +-static int get_proxy_type(void); + + /** The last addresses that our network interface seemed to have been + * binding to. We use this as one way to detect when our IP changes. +@@ -4390,6 +4389,27 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + { + const or_options_t *options = get_options(); + ++ /* Client Transport Plugins can use another proxy, but that should be hidden ++ * from the rest of tor (as the plugin is responsible for dealing with the ++ * proxy), check it first, then check the rest of the proxy types to allow ++ * the config to have unused ClientTransportPlugin entries. ++ */ ++ if (options->ClientTransportPlugin) { ++ const transport_t *transport = NULL; ++ int r; ++ r = find_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); ++ if (r<0) ++ return -1; ++ if (transport) { /* transport found */ ++ tor_addr_copy(addr, &transport->addr); ++ *port = transport->port; ++ *proxy_type = transport->socks_version; ++ return 0; ++ } ++ ++ /* Unused ClientTransportPlugin. */ ++ } ++ + if (options->HTTPSProxy) { + tor_addr_copy(addr, &options->HTTPSProxyAddr); + *port = options->HTTPSProxyPort; +@@ -4405,43 +4425,12 @@ get_proxy_addrport(tor_addr_t *addr, uint16_t *port, int *proxy_type, + *port = options->Socks5ProxyPort; + *proxy_type = PROXY_SOCKS5; + return 0; +- } else if (options->ClientTransportPlugin || +- options->Bridges) { +- const transport_t *transport = NULL; +- int r; +- r = find_transport_by_bridge_addrport(&conn->addr, conn->port, &transport); +- if (r<0) +- return -1; +- if (transport) { /* transport found */ +- tor_addr_copy(addr, &transport->addr); +- *port = transport->port; +- *proxy_type = transport->socks_version; +- return 0; +- } + } + + *proxy_type = PROXY_NONE; + return 0; + } + +-/** Returns the global proxy type used by tor. */ +-static int +-get_proxy_type(void) +-{ +- const or_options_t *options = get_options(); +- +- if (options->HTTPSProxy) +- return PROXY_CONNECT; +- else if (options->Socks4Proxy) +- return PROXY_SOCKS4; +- else if (options->Socks5Proxy) +- return PROXY_SOCKS5; +- else if (options->ClientTransportPlugin) +- return PROXY_PLUGGABLE; +- else +- return PROXY_NONE; +-} +- + /** Log a failed connection to a proxy server. + * conn is the connection we use the proxy server for. */ + void +@@ -4457,7 +4446,7 @@ log_failed_proxy_connection(connection_t *conn) + log_warn(LD_NET, + "The connection to the %s proxy server at %s just failed. " + "Make sure that the proxy server is up and running.", +- proxy_type_to_string(get_proxy_type()), ++ proxy_type_to_string(proxy_type), + fmt_addrport(&proxy_addr, proxy_port)); + } + +diff --git a/src/or/transports.c b/src/or/transports.c +index 3749d6b..cae1f31 100644 +--- a/src/or/transports.c ++++ b/src/or/transports.c +@@ -103,6 +103,8 @@ static INLINE int proxy_configuration_finished(const managed_proxy_t *mp); + + static void managed_proxy_destroy(managed_proxy_t *mp, + int also_terminate_process); ++static char* get_pt_proxy_uri(void); ++static void parse_proxy_error(const char *line); + + static void handle_finished_proxy(managed_proxy_t *mp); + static int configure_proxy(managed_proxy_t *mp); +@@ -123,6 +125,8 @@ static INLINE void free_execve_args(char **arg); + #define PROTO_SMETHOD_ERROR "SMETHOD-ERROR" + #define PROTO_CMETHODS_DONE "CMETHODS DONE" + #define PROTO_SMETHODS_DONE "SMETHODS DONE" ++#define PROTO_PROXY_DONE "PROXY DONE" ++#define PROTO_PROXY_ERROR "PROXY-ERROR" + + /** The first and only supported - at the moment - configuration + protocol version. */ +@@ -434,6 +438,17 @@ add_transport_to_proxy(const char *transport, managed_proxy_t *mp) + static int + proxy_needs_restart(const managed_proxy_t *mp) + { ++ int ret = 1; ++ char* proxy_uri; ++ ++ /* If the PT proxy config has changed, then all existing pluggable transports ++ * should be restarted. ++ */ ++ ++ proxy_uri = get_pt_proxy_uri(); ++ if (strcmp_opt(proxy_uri, mp->proxy_uri) != 0) ++ goto needs_restart; ++ + /* mp->transport_to_launch is populated with the names of the + transports that must be launched *after* the SIGHUP. + mp->transports is populated with the transports that were +@@ -454,10 +469,10 @@ proxy_needs_restart(const managed_proxy_t *mp) + + } SMARTLIST_FOREACH_END(t); + +- return 0; +- +- needs_restart: +- return 1; ++ ret = 0; ++needs_restart: ++ tor_free(proxy_uri); ++ return ret; + } + + /** Managed proxy mp must be restarted. Do all the necessary +@@ -488,6 +503,11 @@ proxy_prepare_for_restart(managed_proxy_t *mp) + SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t)); + smartlist_clear(mp->transports); + ++ /* Reset the proxy's HTTPS/SOCKS proxy */ ++ tor_free(mp->proxy_uri); ++ mp->proxy_uri = get_pt_proxy_uri(); ++ mp->proxy_supported = 0; ++ + /* flag it as an infant proxy so that it gets launched on next tick */ + mp->conf_state = PT_PROTO_INFANT; + unconfigured_proxies_n++; +@@ -718,12 +738,52 @@ managed_proxy_destroy(managed_proxy_t *mp, + /* free the argv */ + free_execve_args(mp->argv); + ++ /* free the outgoing proxy URI */ ++ tor_free(mp->proxy_uri); ++ + tor_process_handle_destroy(mp->process_handle, also_terminate_process); + mp->process_handle = NULL; + + tor_free(mp); + } + ++/** Convert the tor proxy options to a URI suitable for TOR_PT_PROXY. */ ++static char * ++get_pt_proxy_uri(void) ++{ ++ const or_options_t *options = get_options(); ++ char *uri = NULL; ++ ++ if (options->Socks4Proxy || options->Socks5Proxy || options->HTTPSProxy) { ++ char addr[TOR_ADDR_BUF_LEN+1]; ++ ++ if (options->Socks4Proxy) { ++ tor_addr_to_str(addr, &options->Socks4ProxyAddr, sizeof(addr), 1); ++ tor_asprintf(&uri, "socks4a://%s:%d", addr, options->Socks4ProxyPort); ++ } else if (options->Socks5Proxy) { ++ tor_addr_to_str(addr, &options->Socks5ProxyAddr, sizeof(addr), 1); ++ if (!options->Socks5ProxyUsername && !options->Socks5ProxyPassword) { ++ tor_asprintf(&uri, "socks5://%s:%d", addr, options->Socks5ProxyPort); ++ } else { ++ tor_asprintf(&uri, "socks5://%s:%s@%s:%d", ++ options->Socks5ProxyUsername, ++ options->Socks5ProxyPassword, ++ addr, options->Socks5ProxyPort); ++ } ++ } else if (options->HTTPSProxy) { ++ tor_addr_to_str(addr, &options->HTTPSProxyAddr, sizeof(addr), 1); ++ if (!options->HTTPSProxyAuthenticator) { ++ tor_asprintf(&uri, "http://%s:%d", addr, options->HTTPSProxyPort); ++ } else { ++ tor_asprintf(&uri, "http://%s@%s:%d", options->HTTPSProxyAuthenticator, ++ addr, options->HTTPSProxyPort); ++ } ++ } ++ } ++ ++ return uri; ++} ++ + /** Handle a configured or broken managed proxy mp. */ + static void + handle_finished_proxy(managed_proxy_t *mp) +@@ -736,6 +796,12 @@ handle_finished_proxy(managed_proxy_t *mp) + managed_proxy_destroy(mp, 0); /* destroy it but don't terminate */ + break; + case PT_PROTO_CONFIGURED: /* if configured correctly: */ ++ if (mp->proxy_uri && !mp->proxy_supported) { ++ log_warn(LD_CONFIG, "Managed proxy '%s' did not configure the " ++ "specified outgoing proxy.", mp->argv[0]); ++ managed_proxy_destroy(mp, 1); /* annihilate it. */ ++ break; ++ } + register_proxy(mp); /* register its transports */ + mp->conf_state = PT_PROTO_COMPLETED; /* and mark it as completed. */ + break; +@@ -854,6 +920,22 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) + goto err; + + return; ++ } else if (!strcmpstart(line, PROTO_PROXY_DONE)) { ++ if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) ++ goto err; ++ ++ if (mp->proxy_uri) { ++ mp->proxy_supported = 1; ++ return; ++ } ++ ++ /* No proxy was configured, this should log */ ++ } else if (!strcmpstart(line, PROTO_PROXY_ERROR)) { ++ if (mp->conf_state != PT_PROTO_ACCEPTING_METHODS) ++ goto err; ++ ++ parse_proxy_error(line); ++ goto err; + } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) { + /* managed proxy launch failed: parse error message to learn why. */ + int retval, child_state, saved_errno; +@@ -1105,6 +1187,21 @@ parse_cmethod_line(const char *line, managed_proxy_t *mp) + return r; + } + ++/** Parses an PROXY-ERROR line and warns the user accordingly. */ ++static void ++parse_proxy_error(const char *line) ++{ ++ /* (Length of the protocol string) plus (a space) and (the first char of ++ the error message) */ ++ if (strlen(line) < (strlen(PROTO_PROXY_ERROR) + 2)) ++ log_notice(LD_CONFIG, "Managed proxy sent us an %s without an error " ++ "message.", PROTO_PROXY_ERROR); ++ ++ log_warn(LD_CONFIG, "Managed proxy failed to configure the " ++ "pluggable transport's outgoing proxy. (%s)", ++ line+strlen(PROTO_PROXY_ERROR)+1); ++} ++ + /** Return the string that tor should place in TOR_PT_SERVER_BINDADDR + * while configuring the server managed proxy in mp. The + * string is stored in the heap, and it's the the responsibility of +@@ -1193,6 +1290,14 @@ create_managed_proxy_environment(const managed_proxy_t *mp) + * variable in Tor's environment and crash PTs that try to parse + * it even when not run in server mode.) */ + smartlist_add(envs, tor_strdup("TOR_PT_EXTENDED_SERVER_PORT=")); ++ } else { ++ /* If ClientTransportPlugin has a HTTPS/SOCKS proxy configured, set the ++ * TOR_PT_PROXY line. ++ */ ++ ++ if (mp->proxy_uri) { ++ smartlist_add_asprintf(envs, "TOR_PT_PROXY=%s", mp->proxy_uri); ++ } + } + + SMARTLIST_FOREACH_BEGIN(envs, const char *, env_var) { +@@ -1225,6 +1330,7 @@ managed_proxy_create(const smartlist_t *transport_list, + mp->is_server = is_server; + mp->argv = proxy_argv; + mp->transports = smartlist_new(); ++ mp->proxy_uri = get_pt_proxy_uri(); + + mp->transports_to_launch = smartlist_new(); + SMARTLIST_FOREACH(transport_list, const char *, transport, +diff --git a/src/or/transports.h b/src/or/transports.h +index 6ee82f4..f13de5d 100644 +--- a/src/or/transports.h ++++ b/src/or/transports.h +@@ -74,6 +74,9 @@ typedef struct { + char **argv; /* the cli arguments of this proxy */ + int conf_protocol; /* the configuration protocol version used */ + ++ char *proxy_uri; /* the outgoing proxy in TOR_PT_PROXY URI format */ ++ int proxy_supported : 1; /* the proxy claims to honor TOR_PT_PROXY */ ++ + int is_server; /* is it a server proxy? */ + + /* A pointer to the process handle of this managed proxy. */ +-- +1.8.1.2 + +From 34004139ee9380c5c468d28037520d02681dd7cf Mon Sep 17 00:00:00 2001 +From: Yawning Angel <yawning(a)schwanenlied.me> +Date: Thu, 1 May 2014 19:01:34 +0000 +Subject: [PATCH 2/2] Improve the log message when a transport doesn't support + proxies. + +Per feedback, explicltly note that the transport will be killed when it +does not acknowledge the configured outgoing proxy. +--- + src/or/transports.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/or/transports.c b/src/or/transports.c +index cae1f31..917d12a 100644 +--- a/src/or/transports.c ++++ b/src/or/transports.c +@@ -798,7 +798,8 @@ handle_finished_proxy(managed_proxy_t *mp) + case PT_PROTO_CONFIGURED: /* if configured correctly: */ + if (mp->proxy_uri && !mp->proxy_supported) { + log_warn(LD_CONFIG, "Managed proxy '%s' did not configure the " +- "specified outgoing proxy.", mp->argv[0]); ++ "specified outgoing proxy and will be terminated.", ++ mp->argv[0]); + managed_proxy_destroy(mp, 1); /* annihilate it. */ + break; + } +-- +1.8.1.2 +

1 0

[tor-launcher/master] Correctly handle startup paths that contain dot.
by brade＠torproject.org 29 Apr '14

29 Apr '14

commit 240a79d729ba5dcca5ebe3dc4a853bfb68fcd348 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 29 13:31:49 2014 -0400 Correctly handle startup paths that contain dot. --- src/components/tl-process.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index d927b06..2efea99 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -655,8 +655,10 @@ TorProcessService.prototype = .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); while (tbbBrowserDepth > 0) { + var didRemove = (topDir.leafName != "."); topDir = topDir.parent; - tbbBrowserDepth--; + if (didRemove) + tbbBrowserDepth--; } }

1 0

[tor-browser-bundle/master] Bug 11629: Revert obfsproxy to 0.2.4.
by mikeperry＠torproject.org 28 Apr '14

28 Apr '14

commit 793a4cd404516b032bc696b4b0e6bb43bafb2e18 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 28 20:01:29 2014 +0200 Bug 11629: Revert obfsproxy to 0.2.4. --- Bundle-Data/Docs/ChangeLog.txt | 1 - gitian/versions.beta | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 750537e..e7d5178 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,7 +8,6 @@ Tor Browser Bundle 3.6 -- Apr 29 2014 * Bug 7439: Improve download warning dialog text. * Bug 11384: Completely remove hidden toggle menu item. * Update NoScript to 2.6.8.20 - * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.13 * Backport Pending Tor Patches: * Bug 11156: Additional obfsproxy startup error message fixes diff --git a/gitian/versions.beta b/gitian/versions.beta index 59a18fe..3460248 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.8 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Roll back HTTPS-E to 3.4.5.
by mikeperry＠torproject.org 28 Apr '14

28 Apr '14

commit cde005244bf739269a02c124d24187378563f050 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 28 15:42:05 2014 +0200 Roll back HTTPS-E to 3.4.5. HTTPS-E 3.5 builds are no longer reproducible. --- Bundle-Data/Docs/ChangeLog.txt | 1 - gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 52610c4..750537e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,6 @@ Tor Browser Bundle 3.6 -- Apr 29 2014 * Update Torbutton to 1.6.9.0 * Bug 7439: Improve download warning dialog text. * Bug 11384: Completely remove hidden toggle menu item. - * Update HTTPS-Everywhere to 3.5.1 * Update NoScript to 2.6.8.20 * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.13 diff --git a/gitian/versions b/gitian/versions index 81ec1e8..a410fff 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 4ede6e6..3ca3442 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 2560de3..59a18fe 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere version to 3.5.1.
by gk＠torproject.org 26 Apr '14

26 Apr '14

commit 13e785546c9197c1b8698a42e3e4c1909824545f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 26 14:05:19 2014 +0000 Bump HTTPS-Everywhere version to 3.5.1. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 28e1ba2..52610c4 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,7 +7,7 @@ Tor Browser Bundle 3.6 -- Apr 29 2014 * Update Torbutton to 1.6.9.0 * Bug 7439: Improve download warning dialog text. * Bug 11384: Completely remove hidden toggle menu item. - * Update HTTPS-Everywhere to 3.5 + * Update HTTPS-Everywhere to 3.5.1 * Update NoScript to 2.6.8.20 * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.13 diff --git a/gitian/versions b/gitian/versions index c699242..81ec1e8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.5 +HTTPSE_TAG=3.5.1 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index cb0551c..4ede6e6 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5 +HTTPSE_TAG=3.5.1 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 91c4a2c..2560de3 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5 +HTTPSE_TAG=3.5.1 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/master] Pick up new browser tag for build failure.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit eeec4ba06cf7c4f8354b7e617f03eb286b94d296 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 21:28:19 2014 +0200 Pick up new browser tag for build failure. --- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions b/gitian/versions index a73640e..c699242 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,7 +5,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8cf027f..cb0551c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -6,7 +6,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 diff --git a/gitian/versions.beta b/gitian/versions.beta index fef930f..91c4a2c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -6,7 +6,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0

1 0

[tor-browser/tor-browser-24.5.0esr-1] fixup! fix #9308 and #11433: don't leak user install path of TBB
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit e3a8d5fdd5dad12a0bcb6d2290553914457dd91e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 21:23:44 2014 +0200 fixup! fix #9308 and #11433: don't leak user install path of TBB Turns out case matters in C++. Who knew? --- js/xpconnect/src/XPCException.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/xpconnect/src/XPCException.cpp b/js/xpconnect/src/XPCException.cpp index bb4064a..7bd71a4 100644 --- a/js/xpconnect/src/XPCException.cpp +++ b/js/xpconnect/src/XPCException.cpp @@ -298,7 +298,7 @@ nsXPCException::Initialize(const char *aMessage, nsresult aResult, const char *a nsAutoCString resourceFilename; mozilla::Omnijar::ConvertToResourceFilename(nsCString(rawFilename), resourceFilename); mFilename = (char *) nsMemory::Clone(resourceFilename.get(), resourceFilename.Length()+1); - nsMemory::Free(rawFileName); // allocated by GetFilename + nsMemory::Free(rawFilename); // allocated by GetFilename if (NS_FAILED(rc = aLocation->GetLineNumber(&mLineNumber))) return rc; } else {

1 0

[tor-browser-bundle/master] Mention FTE update in changelog.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 3a806b0580b608f1f75d07a641320c866a5f2a63 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 11:21:35 2014 -0700 Mention FTE update in changelog. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2fd4e04..28e1ba2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,6 +10,7 @@ Tor Browser Bundle 3.6 -- Apr 29 2014 * Update HTTPS-Everywhere to 3.5 * Update NoScript to 2.6.8.20 * Update obfs3 transport to 0.2.8 + * Update fte transport to 0.2.13 * Backport Pending Tor Patches: * Bug 11156: Additional obfsproxy startup error message fixes * Bug 11586: Include license files for component software in Docs directory.

1 0

[tor-browser-bundle/master] Update versions and ChangeLog for TBB 3.6.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit ce30cd3a3862189369ae09450b01b03271ad8366 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 10:50:16 2014 -0700 Update versions and ChangeLog for TBB 3.6. --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++-- gitian/versions | 4 ++-- gitian/versions.alpha | 8 ++++---- gitian/versions.beta | 10 +++++----- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f9d1e76..2fd4e04 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,15 +4,18 @@ Tor Browser Bundle 3.6 -- Apr 29 2014 * Update Tor Launcher to 0.2.5.4 * Bug #11482: Hide bridge settings prompt if no default bridges. * Bug #11484: Show help button even if no default bridges. - * Update Torbutton to 1.6.8.1 + * Update Torbutton to 1.6.9.0 * Bug 7439: Improve download warning dialog text. * Bug 11384: Completely remove hidden toggle menu item. * Update HTTPS-Everywhere to 3.5 * Update NoScript to 2.6.8.20 - * Update obfs3 transport to XXX + * Update obfs3 transport to 0.2.8 * Backport Pending Tor Patches: * Bug 11156: Additional obfsproxy startup error message fixes * Bug 11586: Include license files for component software in Docs directory. + * Windows and Mac: + * Bug 9308: Prevent install path from leaking in some JS exceptions + on Mac and Windows builds Tor Browser Bundle 3.6-beta-2 -- Apr 8 2014 * All Platforms diff --git a/gitian/versions b/gitian/versions index a9c372c..a73640e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,7 +5,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 @@ -15,7 +15,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.8 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 9c5fa02..8cf027f 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.4.0esr +FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.5.3-alpha -TORLAUNCHER_TAG=0.2.5.3 -TORBUTTON_TAG=1.6.8.1 +TORLAUNCHER_TAG=0.2.5.4 +TORBUTTON_TAG=1.6.9.0 HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.8 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 diff --git a/gitian/versions.beta b/gitian/versions.beta index f6c24a2..fef930f 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-pre +TORBROWSER_VERSION=3.6 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,17 +6,17 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 -TORLAUNCHER_TAG=0.2.5.3 -TORBUTTON_TAG=1.6.8.1 +TORLAUNCHER_TAG=0.2.5.4 +TORBUTTON_TAG=1.6.9.0 HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +OBFSPROXY_TAG=obfsproxy-0.2.8 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[torbutton/master] Translation updates.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 536c7471806e28476f00534250f59c046a950976 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 10:44:09 2014 -0700 Translation updates. --- src/chrome/locale/ar/torbutton.properties | 12 ++++---- src/chrome/locale/de/torbutton.properties | 14 ++++----- src/chrome/locale/es/torbutton.properties | 12 ++++---- src/chrome/locale/eu/torbutton.properties | 12 ++++---- src/chrome/locale/fa/torbutton.properties | 12 ++++---- src/chrome/locale/fr/torbutton.properties | 12 ++++---- src/chrome/locale/it/torbutton.properties | 30 +++++++++---------- src/chrome/locale/ja/torbutton.properties | 12 ++++---- src/chrome/locale/ko/torbutton.properties | 12 ++++---- src/chrome/locale/nl/torbutton.properties | 12 ++++---- src/chrome/locale/pl/torbutton.properties | 12 ++++---- src/chrome/locale/pt/torbutton.properties | 12 ++++---- src/chrome/locale/ru/torbutton.properties | 12 ++++---- src/chrome/locale/sv/torbutton.properties | 12 ++++---- src/chrome/locale/tr/torbutton.properties | 40 +++++++++++++------------- src/chrome/locale/vi/torbutton.properties | 12 ++++---- src/chrome/locale/zh-CN/torbutton.properties | 12 ++++---- 17 files changed, 126 insertions(+), 126 deletions(-) diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties index ed55fb9..221eecd 100644 --- a/src/chrome/locale/ar/torbutton.properties +++ b/src/chrome/locale/ar/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = الاختبار الآلي لبروكسي ت torbutton.prefs.recommended = (موصى به) torbutton.prefs.optional = (إختياري) torbutton.prefs.crucial = (أساسي) -torbutton.popup.external.title = تحميل محتوى خارجي؟ -torbutton.popup.external.app = هناك حاجة لاستخدام برنامج خارجي للتعامل مع:\n\n -torbutton.popup.external.note = \n\nملاحظة: البرامج الخارجية ليست آمنة مع تور بشكل افتراضي ويمكن أن تكشف هويتك!\n -torbutton.popup.external.suggest = \nإذا كان هذا الملف غير موثوق به، عليك إما أن تحفظه لاستعراضه دون أن تكون متصلاً بالإنترنت، أو إما باستخدام آلة افتراضية، أو حاول استخدام بروكسي مثل Tails LiveCD أو torsocks.\n -torbutton.popup.launch = تشغيل البرنامج +torbutton.popup.external.title = هل تريد تنزيل ملفاً من نوع الوصلة الخارجية؟ +torbutton.popup.external.app = لا يمكن لمتصفّح تور عرض هذه الملف, يجب عليك أن تفتحه باستعمال تطبيق أخر.\n\n +torbutton.popup.external.note = بعض الأنواع من الملفات قد تعمل على إعطاء بعض التطبيقات الإمكانيّة للاتصال بالإنترنت دون استعمال تور.\n\n +torbutton.popup.external.suggest = لسلامتك, يجب عليك فتح الملفات المنزّلة مسبقاً عند كونك غير متصلاً بالإنترنت, أو استعمل قرص مضغوط لـ Tor Life , مثل Tails.\n +torbutton.popup.launch = إنزال الملف torbutton.popup.cancel = إلغاء -torbutton.popup.dontask = دائماً شغل البرامج ابتداءً من الآن +torbutton.popup.dontask = أنزل الملفات بشكلٍ أوتوماتيكيّ من الأن فصاعداً torbutton.popup.test.no_http_proxy = فحص بروكسي تور: لا يمكن الوصول إلى بروكسي HTTP المحلي. هل يعمل Polipo بشكل صحيح؟ torbutton.popup.captcha.title = تجنب Captcha جوجل؟ torbutton.popup.captcha.ask = كشف مفتاح تور من وجود Captcha جوجل. هل تريد أن يتم توجيهك إلى محرك بحث آخر لتنفيذ عملية البحث هذه؟ diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties index c968c32..3c4f5ee 100644 --- a/src/chrome/locale/de/torbutton.properties +++ b/src/chrome/locale/de/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Der automatische Tor-Vermittlungsservertest i torbutton.prefs.recommended = (empfohlen) torbutton.prefs.optional = (optional) torbutton.prefs.crucial = (kritisch) -torbutton.popup.external.title = Externen Inhalt laden? -torbutton.popup.external.app = Eine externe Anwendung wird benötigt, um mit dem folgenden Objekt umzugehen:\n\n -torbutton.popup.external.note = \n\nAnmerkung: Externe Anwendungen sind im Allgemeinen NICHT Tor gesichert und können Sie verraten!\n -torbutton.popup.external.suggest = \nSollte dieser Datei nicht vertraut werden, speichern sie sie ab um sie offline oder in einer VM anzusehen,\noder ziehen sie in betracht einen transparenten Tor-Vermittlungsserver wie die Tails-LiveCD oder torsocks zu benutzen.\n -torbutton.popup.launch = Anwendung starten +torbutton.popup.external.title = Einen externen Dateitypen herunterladen +torbutton.popup.external.app = Tor-Browser kann diese Datei nicht anzeigen. Sie müssen es mit einer anderen Anwendung öffnen.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Datei herunterladen torbutton.popup.cancel = Abbrechen -torbutton.popup.dontask = Von nun an Anwendungen immer laden +torbutton.popup.dontask = Von jetzt an Dateien immer automatisch herunterladen torbutton.popup.test.no_http_proxy = Tor-Vermittlungsservertest: Lokaler HTTP-Vermittlungsserver ist unerreichbar. Läuft Polipo korrekt? torbutton.popup.captcha.title = Google-Captchas vermeiden? torbutton.popup.captcha.ask = Torbutton hat ein Google-Captcha festgestellt. Möchten Sie für Ihre Suchanfrage zu einer anderen Suchmaschine umgeleitet werden? @@ -48,7 +48,7 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph torbutton.popup.never_ask_again = Nicht mehr nachfragen # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Diese Webseite (%S) hat versucht, auf Bilddaten von einem Canvas zuzugreifen. Da Canvas Bilddaten dazu benutzt werden können, um Informationen über ihren Rechner zu bekommen, wurden diesmal leere Bilddaten an die Webseite geschickt +canvas.siteprompt=Die Webseite (%S) hat versucht, auf Bilddaten von einem Canvas zuzugreifen. Da Canvas Bilddaten dazu benutzt werden können, um Informationen über ihren Rechner zu bekommen, wurden diesmal leere Bilddaten an die Webseite geschickt canvas.allow=In Zukunft Erlauben canvas.allowAccessKey=I canvas.never=Niemals für diese Website diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index ad2dc91..ef75962 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = La prueba automática con "proxy" Tor falló torbutton.prefs.recommended = (recomendado) torbutton.prefs.optional = (opcional) torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = ¿Cargar contenido externo? -torbutton.popup.external.app = Es necesaria una aplicación externa para abrir el archivo:\n\n -torbutton.popup.external.note = \n\nNOTA: ¡Las aplicaciones externas por defecto NO son de uso seguro para Tor y podrían desenmascararle (v.g. estableciendo alguna conexión sin pasar por Tor)!\n -torbutton.popup.external.suggest = \nSi este archivo no es de confianza, debería bien guardarlo para verlo\ncuando esté desconectado o en una máquina virtual (VM), o bien\nconsiderar usar un "proxy" Tor transparente (que torifica todas las aplicaciones sin configurarlas) como Tails LiveCD o torsocks.\n -torbutton.popup.launch = Arrancar aplicación +torbutton.popup.external.title = ¿Descargar un tipo de fichero externo? +torbutton.popup.external.app = El Navegador Tor no puede mostrar este fichero. Tendrá que abrirlo con otra aplicación.\n\n +torbutton.popup.external.note = Algunos tipos de ficheros pueden hacer que ciertas aplicaciones se conecten a Internet sin usar Tor.\n\n +torbutton.popup.external.suggest = Para estar seguro, debería abrir únicamente los archivos descargados cuando no esté conectado, o usar un Live CD (autoarrancable) de Tor como Tails.\n +torbutton.popup.launch = Descargar fichero torbutton.popup.cancel = Cancelar -torbutton.popup.dontask = En adelante arrancar aplicaciones siempre +torbutton.popup.dontask = Descargar ficheros automáticamente a partir de ahora torbutton.popup.test.no_http_proxy = Prueba con "proxy" Tor: El proxy HTTP local es inalcanzable. ¿Está Polipo funcionando correctamente? torbutton.popup.captcha.title = ¿Evitar los captchas de Google? torbutton.popup.captcha.ask = Torbutton detectó un captcha de Google. ¿Desea que su petición sea redirigida a otro motor de búsqueda? diff --git a/src/chrome/locale/eu/torbutton.properties b/src/chrome/locale/eu/torbutton.properties index ad0dbba..15b29be 100644 --- a/src/chrome/locale/eu/torbutton.properties +++ b/src/chrome/locale/eu/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Tor proxy froga automatikoak huts egin du Tor torbutton.prefs.recommended = (gomendatua) torbutton.prefs.optional = (hautazkoa) torbutton.prefs.crucial = (erabakigarria) -torbutton.popup.external.title = Kanpoko edukia kargatu? -torbutton.popup.external.app = Kanpoko aplikazio bat behar da hurrengorako:\n\n -torbutton.popup.external.note = \n\nOHARRA: Kanpoko aplikazioak EZ dira beti seguruak!\n -torbutton.popup.external.suggest = \nFitxategi hau ziurtatu gabe badago, lineaz kanpo edo VM batean ikusteko gorde beharko zenuke,\nedo Tails LiveCD edo torsocks bezalako Tor proxy garden bat erabiltzea kontutan hartu.\n -torbutton.popup.launch = Aplikazioa exekutatu +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = Utzi -torbutton.popup.dontask = Beti exekutatu aplikazioak hemendik aurrera +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor proxy froga: Ezin da HTTP Proxy lokalera iritsi. Polipo zuzen exekutatzen ari da? torbutton.popup.captcha.title = Saihestu Googleren Captchak? torbutton.popup.captcha.ask = Torbuttonek Google Captcha dat detektatu du. Beste bilaketa motor batera birbideratua izan nahi al duzu eskakizun honetarako? diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 7dd715f..44137ab 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = تست خودکار پراکسی تُربا torbutton.prefs.recommended = (توصيه شده) torbutton.prefs.optional = (اختياری) torbutton.prefs.crucial = (بسيار مهم) -torbutton.popup.external.title = محتویات خارجی بارگزاری شوند؟ -torbutton.popup.external.app = یک برنامه خارجی باید وارد عمل شود:\n\n -torbutton.popup.external.note = \n\nنکته: برنامه های خارجی توسط تُر به طور پیشفرض امن نشده اند و ممکن است هویت اصلی شما را آشکار کنند!\n -torbutton.popup.external.suggest = \nاگر این فایل غیر قابل اطمینان است ، شما یا باید آن را به نمایش در حالی که آفلاین یا در یک ماشین مجازی ، و یا در نظر بگیرید با استفاده از یک پروکسی شفاف Tor به مانند دیسک زنده یا torsocks دم نجات.\n -torbutton.popup.launch = اجرای برنامه +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = لغو -torbutton.popup.dontask = از حالا به بعد هر برنامه ای را اجرا کن +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = آزمون پراکسی تُر: پراکسی HTTP محلی قابل دسترسی نیست. آیا پولیپو به درستی اجرا شده است؟ torbutton.popup.captcha.title = Avoid Google Captchas? torbutton.popup.captcha.ask = Torbutton detected a Google Captcha. Would you like to be redirected to another search engine for this query? diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 2204e2f..497d85b 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Le test automatique du proxy Tor n'a pas réu torbutton.prefs.recommended = (recommandé) torbutton.prefs.optional = (facultatif) torbutton.prefs.crucial = (indispensable) -torbutton.popup.external.title = Charger un contenu externe ? -torbutton.popup.external.app = Une application externe est requise pour gérer :\n\n -torbutton.popup.external.note = \n\nNOTE : les applications externes ne sont a priori pas sécuritaires pour Tor et peuvent vous démasquer !\n -torbutton.popup.external.suggest = \nSi vous n'avez pas confiance dans ce fichier, vous devriez soit l'enregistrer et le consulter hors-ligne ou dans une machine virtuelle VM sans réseau,\nou envisager d'utiliser un proxy transparent Tor tel que Tails LiveCD ou torsocks.\n -torbutton.popup.launch = Lancer l'application +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = Annuler -torbutton.popup.dontask = Toujours lancer les applications à partir de maintenant +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Test du proxy Tor : le proxy HTTP local est injoignable. Est-ce que Polipo fonctionne correctement ? torbutton.popup.captcha.title = Eviter les captchas (test permettant de différencier un utilisateur humain d'un ordinateur) de Google ? torbutton.popup.captcha.ask = Torbutton a détecté un captcha Google. Voulez-vous être redirigé vers un autre moteur de recherche pour cette recherche ? diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties index f94a701..c48a918 100644 --- a/src/chrome/locale/it/torbutton.properties +++ b/src/chrome/locale/it/torbutton.properties @@ -7,42 +7,42 @@ torbutton.panel.plugins.enabled = Fai clic per disattivare i plugin torbutton.panel.label.disabled = Tor disattivato torbutton.panel.label.enabled = Tor attivato extensions.torbutton(a)torproject.org.description = Torbutton fornisce un pulsante per configurare le impostazioni di Tor e rimuovere velocemente e facilmente i dati di navigazione privati. -torbutton.popup.history.warning = Torbutton ha bloccato le attività in una scheda caricata con un diverso stato Tor.\n\nQuesta operazione evita i Bug 409737 e 417869 di Firefox.\n\nSe questo messaggio popup appare senza motivo, una delle vostre schede è stata bloccata perchè sta tentando di autoricaricarsi in modo silente.\n\nPer ricaricare la scheda in questo stato Tor, premere 'invio' nella barra degli indirizzi.\n\n +torbutton.popup.history.warning = Torbutton ha bloccato le attività in una scheda caricata con un diverso stato Tor.\n\nQuesta operazione evita i Bug 409737 e 417869 di Firefox.\n\nSe questo messaggio popup appare senza motivo, una delle vostre schede è stata bloccata perchè sta tentando di autoricaricarsi in modo silenzioso.\n\nPer ricaricare la scheda in questo stato Tor, premere "invio" nella barra degli indirizzi.\n\n torbutton.popup.plugin.warning = Torbutton ha bloccato l'attivazione dei plugin durante l'uso di Tor.\n\nUsa Salva Con Nome al suo posto.\n\n -torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle Certification Authority personalizzate. L'esame della lista delle Certification Authority è un'operazione lenta e rallenta ancora attivando/disattivando Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK) +torbutton.popup.confirm_ca_certs = Avviso di Torbutton: sembra che tu non abbia delle Certification Authority personalizzate. L'esame della lista delle Certification Authority è un'operazione lenta e rallenta l'attivazione/disattivazione di Tor. Vuoi disabilitare l'isolamento dei certificati delle Certification Authority? (Se non capisci questo avviso, puoi tranquillamente fare clic su OK) torbutton.popup.ff3.warning = Attenzione!\n\nTorbutton su Firefox 3 divulga il tuo fuso orario ed i tuoi livemark via Tor.\n\nVuoi continuare ugualmente? -torbutton.popup.toggle.warning = Devi attivare e disattivare Tor o riavviare in modo che le impostazioni abbiano effetto. +torbutton.popup.toggle.warning = Devi attivare e disattivare Tor o riavviare per far sì che le impostazioni abbiano effetto. torbutton.popup.test.success = Il test del proxy Tor ha avuto successo! torbutton.popup.test.failure = Il test del proxy Tor è FALLITO! Verifica la configurazione del proxy e di Polipo. -torbutton.popup.test.confirm_toggle = Il test più recente di un proxy Tor ha fallito nell'usare Tor.\n\nSei sicuro di volerlo abilitare comunque?\n\nNota: Se hai risolto il problema, puoi riavviare il test nella finestra Preferenze Proxy Torbutton per eliminare questo avvertimento. +torbutton.popup.test.confirm_toggle = Il test più recente di un proxy Tor ha fallito nell'usare Tor.\n\nSei sicuro di volerlo abilitare comunque?\n\nNota: Se hai risolto il problema, puoi riavviare il test nella finestra Preferenze Proxy Torbutton per eliminare questo avviso. torbutton.popup.test.ff3_notice = Fai clic su OK per testare le impostazioni del proxy Tor. Questo test avverrà in background. Sii paziente. torbutton.panel.label.verified = Tor verificato torbutton.popup.test.auto_failed = Il test automatico del proxy Tor non è riuscito ad usare Tor.\n\nSei sicuro di volerlo abilitare ugualmente? torbutton.prefs.recommended = (raccomandato) torbutton.prefs.optional = (facoltativo) torbutton.prefs.crucial = (essenziale) -torbutton.popup.external.title = Caricare il contenuto esterno? -torbutton.popup.external.app = Un'applicazione esterna è necessaria per gestire:\n\n -torbutton.popup.external.note = \n\nNOTA: Le applicazioni esterne NON sono sicure di default e possono compromettere il tuo anonimato!\n -torbutton.popup.external.suggest = \nQuesto file non è fidato, dovresti salvarlo e prenderne visione offline in una macchina virtuale, oppure considerare un proxy Tor trasparente come Railis LiveCD o torsocks.\n -torbutton.popup.launch = Lanciare l'applicazione +torbutton.popup.external.title = Si desidera scaricare un tipo di file esterno? +torbutton.popup.external.app = Tor Browser non è in grado di aprire questo file. Sarà necessario usare un'altra applicazione per aprirlo.\n\n +torbutton.popup.external.note = Alcuni tipi di file possono far sì che le applicazioni si connettano a Internet senza usare Tor.\n\n +torbutton.popup.external.suggest = Per essere totalmente sicuri, si dovrebbe aprire i file scaricati solo quando si è offline, o usare un Live CD Tor come ad esempio Tails.\n +torbutton.popup.launch = Scaricare il file torbutton.popup.cancel = Annulla -torbutton.popup.dontask = Da adesso lanciare sempre le applicazioni +torbutton.popup.dontask = Scaricare automaticamente i file d'ora in poi torbutton.popup.test.no_http_proxy = Test Tor proxy: Proxy HTTP locale non è raggiungibile. Polipo è in funzione correttamente? torbutton.popup.captcha.title = Evitare i Captcha di Google? -torbutton.popup.captcha.ask = Torbutton ha rilevato un Captchta di Google. Ti piacerebbe essere reindirizzato a un altro motore di ricerca per questa query? +torbutton.popup.captcha.ask = Torbutton ha rilevato un Captchta di Google. Preferisci essere reindirizzato a un altro motore di ricerca per questa query? torbutton.popup.captcha.always = Da adesso eseguire sempre questa azione torbutton.popup.redirect = Redirect torbutton.popup.no_redirect = No redirect torbutton.popup.prompted_language = Per aumentare la tua privacy, Torbutton può richiedere la versione inglese delle pagine web. Perciò alcune pagine che preferiresti leggere nella tua lingua potrebbero essere visualizzate in inglese.\n\nPreferisci richiedere le pagine web in inglese per una maggiore privacy? -torbutton.popup.no_newnym = Torbutton non può assegnarti una nuova identità in modo sicuro, poiché non ha accesso alla porta di controllo di Tor. +torbutton.popup.no_newnym = Torbutton non può assegnarti una nuova identità in modo sicuro, poiché non ha accesso alla porta di controllo di Tor.\n\nStai usando Tor Browser Bundle? torbutton.popup.use_tbb = Sembra che si stia usando Torbutton con Firefox, modalità non più raccomandata come configurazione sicura.\n\nIn alternativa, si consiglia di scaricare la versione più recente del Tor Browser Bundle, inviando una email a gettor(a)torproject.org o scaricandolo da uno dei seguenti indirizzi: -torbutton.popup.pref_error = Torbutton non può aggiornare le preferenze nella pannello profilo del Tor Browser. +torbutton.popup.pref_error = Torbutton non può aggiornare le preferenze nella cartella profilo del Tor Browser. torbutton.popup.permission_denied = Si prega di reimpostare i permessi della cartella Tor Browser oppure di spostarla altrove. torbutton.popup.device_full = Sembra che il disco sia pieno. Liberare spazio o spostare Tor Browser in un altro dispositivo. torbutton.title.prompt_torbrowser = Informazioni importanti su Torbutton -torbutton.popup.prompt_torbrowser = Torbutton ora funziona in modo diverso: non è possibile disabilitarlo.\n\nQuesto cambiamento è stato apportato poiché risulta poco sicuro utilizzare Torbutton in un browser utilizzato anche senza di esso. Ci sono alcuni problemi critici che non è possibile risolvere in un modo diverso da questo.\n\nSe si desidera utilizzare Firefox normalmente (senza, quindi, Torbutton) è necessario disinstallare manualmente Torbutton ed installare Tor Browser Bundle. Le impostazioni per la privacy, inoltre, sono superiori su Tor Browser rispetto ad una normale installazione di Firefox, anche quando quest'ultimo è utilizzato con Torbutton.\n\nPer rimuovere Torbutton, andare in Strumenti -> Componenti aggiuntivi -> Estensioni e cliccare sul pulsante Disinstalla per Torbutton. -torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorbutton ora è sempre abilitato.\n\nClicca su Torbutton per ulteriori informazioni. +torbutton.popup.prompt_torbrowser = Torbutton ora funziona in modo diverso: non è più possibile disabilitarlo.\n\nQuesto cambiamento è stato apportato poiché risulta poco sicuro utilizzare Torbutton in un browser utilizzato anche senza di esso. Ci sono alcuni problemi critici che non è possibile risolvere in un modo diverso da questo.\n\nSe si desidera utilizzare Firefox normalmente (senza, quindi, Torbutton) è necessario disinstallare manualmente Torbutton ed installare Tor Browser Bundle. Le impostazioni per la privacy, inoltre, sono superiori su Tor Browser rispetto ad una normale installazione di Firefox, anche quando quest'ultimo è utilizzato con Torbutton.\n\nPer rimuovere Torbutton, andare in Strumenti -> Componenti aggiuntivi -> Estensioni e fare clic sul pulsante Disinstalla vicino a Torbutton. +torbutton.popup.short_torbrowser = Informazioni importanti su Torbutton!\n\nTorbutton ora è sempre abilitato.\n\nFai clic su Torbutton per ulteriori informazioni. torbutton.popup.confirm_plugins = Alcuni plugin come Flash possono violare la tua privacy e anonimità.\n\nPossono anche eludere Tor per rivelare la tua posizione attuale e il tuo indirizzo IP.\n\nSei sicuro di volere attivare i plugin?\n torbutton.popup.never_ask_again = Non chiedermelo più diff --git a/src/chrome/locale/ja/torbutton.properties b/src/chrome/locale/ja/torbutton.properties index 655b610..c2420ae 100644 --- a/src/chrome/locale/ja/torbutton.properties +++ b/src/chrome/locale/ja/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Torを使用するための自動Torプロキ torbutton.prefs.recommended = (推奨) torbutton.prefs.optional = (オプション) torbutton.prefs.crucial = (重要) -torbutton.popup.external.title = 外部コンテンツを読み込みますか？ -torbutton.popup.external.app = 操作するためには外部アプリケーションが必要です:\n\n -torbutton.popup.external.note = \n\nノート: 外部アプリケーションはTorに対応していないこともあります。その場合、あなたの匿名性は確保されません。\n -torbutton.popup.external.suggest = \nこのファイルが信頼されていない場合、オフラインの間かVMで、表示するためにそれを保存するか、\nTails LiveCDかtorsocksのような透過型Torプロキシの使用を検討するべきです。\n -torbutton.popup.launch = アプリケーション起動 +torbutton.popup.external.title = 外部ファイル種別をダウンロードしますか +torbutton.popup.external.app = Tor ブラウザはこのファイルを表示できません。別のアプリケーションで開く必要があります。\n +torbutton.popup.external.note = ファイルのタイプの中に、アプリケーションが Tor を使用せずインターネットに接続する原因となる可能性があるものがあります。\n +torbutton.popup.external.suggest = 安全であるためには、オフラインの時のみダウンロードしたファイルを開くか、 Tails のような Tor のライブ CD を使用すべきです。\n +torbutton.popup.launch = ファイルをダウンロードする torbutton.popup.cancel = キャンセル -torbutton.popup.dontask = 今後アプリケーションをいつも起動する +torbutton.popup.dontask = 今からファイルを自動的にダウンロードする torbutton.popup.test.no_http_proxy = Torプロキシテスト: ローカルHTTPプロキシに到達できません。Polipoは正常に動作していますか？ torbutton.popup.captcha.title = Google CAPTCHAを回避しますか？ torbutton.popup.captcha.ask = TorbuttonはGoogle CAPTCHAを検出しました。このクエリを別の検索エンジンで実行しますか？ diff --git a/src/chrome/locale/ko/torbutton.properties b/src/chrome/locale/ko/torbutton.properties index f3fa432..a7ffa18 100644 --- a/src/chrome/locale/ko/torbutton.properties +++ b/src/chrome/locale/ko/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = 자동 Tor 프록시 테스트가 실패하 torbutton.prefs.recommended = (추천) torbutton.prefs.optional = (선택) torbutton.prefs.crucial = (중요) -torbutton.popup.external.title = 외부 콘텐츠 로드? -torbutton.popup.external.app = 외부 애플리케이션이 넘겨받는 것을 필요로 합니다:\n\n -torbutton.popup.external.note = \n\nNOTE: 외부 애플리케이션은 기본적으로 Tor에 의해 안전해지지 않으며, 귀하의 신상정보를 얻을 수 있습니다.\n -torbutton.popup.external.suggest = \n만약 이 파일이 신뢰되지 않는다면, 파일을 저장해서 오프라인 상태로 보시던지, VM 내에서 보셔야 합니다.\n또는 Tails LuveCD나 Torsocks 같은 투명 Tor 프록시를 사용하는 것을 고려해 보십시오.\n -torbutton.popup.launch = 애플리케이션 실행 +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = 취소 -torbutton.popup.dontask = 지금부터 항상 애플리케이션 실행 +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor 프록시 테스트: 로컬 HTTP 프록시에 접근할 수 없습니다. Polipo가 확실히 작동중 입니까? torbutton.popup.captcha.title = Google Capchas 피하기? torbutton.popup.captcha.ask = Torbutton이 Google Capctha를 감지했습니다. 이 쿼리를 위해 다른 검색 엔진으로 리다이렉트 하시겠습니까? diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties index 9aab120..6fc64a8 100644 --- a/src/chrome/locale/nl/torbutton.properties +++ b/src/chrome/locale/nl/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = De automatische Tor proxy test is mislukt.\n\ torbutton.prefs.recommended = (aanbevolen) torbutton.prefs.optional = (optioneel) torbutton.prefs.crucial = (cruciaal) -torbutton.popup.external.title = Externe inhoud laden ? -torbutton.popup.external.app = Een externe toepassing is nodig voor : \n\n -torbutton.popup.external.note = \n\n Opmerking : Externe toepassingen zijn NIET veilig en kunnen U ontmaskeren.\n -torbutton.popup.external.suggest = \nAls dit bestand niet vertrouwd is moet je het bestand bewaren en het offline bekijken of in een VM. Of overweeg om een transparante proxy te gebruiken zoals Tails LiveCD of torsocks.\n -torbutton.popup.launch = Toepassing starten +torbutton.popup.external.title = Wilt u een extern bestandstype downloaden? +torbutton.popup.external.app = Tor Browser kan dit bestand niet weergeven. U zou het moeten openen in een andere applicatie.\n\n +torbutton.popup.external.note = Bepaalde type bestanden kunnen ervoor zorgen dat applicaties verbinding met het internet maken zonder Tor.\n\n +torbutton.popup.external.suggest = Om veilig te surfen, zou u alleen bestanden moeten openen terwijl u offline bent, of gebruik een Tor Live CD zoals Tails.\n +torbutton.popup.launch = Download bestand torbutton.popup.cancel = Annuleren -torbutton.popup.dontask = Vanaf nu steeds de toepassing starten +torbutton.popup.dontask = Download bestanden automatisch vanaf nu torbutton.popup.test.no_http_proxy = Tor proxy test : De lokale HTTP proxy is niet bereikbaar. Werkt Polipo zoals het hoort ? torbutton.popup.captcha.title = Google Captchas vermijden ? torbutton.popup.captcha.ask = Torbutton heeft een Google Captcha ontdekt. Mag deze vraag naar een andere zoekmachine gestuurd worden ? diff --git a/src/chrome/locale/pl/torbutton.properties b/src/chrome/locale/pl/torbutton.properties index 3cbc268..8798190 100644 --- a/src/chrome/locale/pl/torbutton.properties +++ b/src/chrome/locale/pl/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Automatyczny test proxy Tora zakończył się torbutton.prefs.recommended = (zalecane) torbutton.prefs.optional = (opcjonalnie) torbutton.prefs.crucial = (krytyczne) -torbutton.popup.external.title = Załadować zewnętrzną zawartość? -torbutton.popup.external.app = Zewnętrzna aplikacja jest wymagana, aby obsłużyć:\n\n -torbutton.popup.external.note = \n\nUWAGA: Zewnętrzne aplikacje NIE są domyślnie bezpieczne przy używaniu Tora i mogą Cię odkryć!\n -torbutton.popup.external.suggest = \nJeśli ten plik jest niezaufany, powinno się go zachować do oglądania offline lub w maszynie wirtualnej,\nlub rozważyć używanie przezroczystego proxy Tor, jak Tails LiveCD lub torsocks.\n -torbutton.popup.launch = Uruchom aplikację +torbutton.popup.external.title = Pobrać zewnętrzny typ pliku? +torbutton.popup.external.app = Tor Browser nie może wyświetlić tego pliku. Musisz otworzyć go z innej aplikacji\n\n +torbutton.popup.external.note = Niektóre typy plików mogą spowodować połączenie się aplikacji z internetem bez użycia sieci Tor.\n\n +torbutton.popup.external.suggest = Aby być bezpiecznym, pobrane pliki należy uruchamiać wyłącznie w trybie offline, lub użyć dystrybucji Live CD Tora, takich jak Tails.\n +torbutton.popup.launch = Pobierz plik torbutton.popup.cancel = Anuluj -torbutton.popup.dontask = Od teraz zawsze uruchamiaj aplikacje +torbutton.popup.dontask = Automatyczne pobieranie plików jest od teraz włączone torbutton.popup.test.no_http_proxy = Test Tor proxy: Lokalne Proxy HTTP jest nieosiągalne. Czy Polipo działa prawidłowo? torbutton.popup.captcha.title = Unikać Google Captcha? torbutton.popup.captcha.ask = Torbutton wykrył Google Captcha. Czy chcesz, aby Cię przekierować na inną wyszukiwarkę dla tego zapytania? diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 3d28aec..fc4ce58 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = O teste automático ao proxy Tor falhou.\n\nD torbutton.prefs.recommended = (recomendado) torbutton.prefs.optional = (opcional) torbutton.prefs.crucial = (crucial) -torbutton.popup.external.title = Carregar conteúdo externo? -torbutton.popup.external.app = Uma aplicação externa é necessário para abrir:\n\n -torbutton.popup.external.note = \n\nNota: Aplicações externas ao Tor NÃO são seguras, e podem dar a conhecer a sua origem!\n -torbutton.popup.external.suggest = \nSe este ficheiro não é seguro, deve guardá-lo para visualizar offline ou numa VM,\nou considere usar uma proxy transparente do Tor como a Tails LiveCD ou torsocks.\n -torbutton.popup.launch = Correr aplicação +torbutton.popup.external.title = Transferir um tipo de ficheiro externo? +torbutton.popup.external.app = O navegador Tor Browser não consegue mostrar este ficheiro. Pode ter que o abrir com outra aplicação.\n\n +torbutton.popup.external.note = Alguns tipos de ficheiro podem implicar uma ligação à Internet sem usar o Tor. +torbutton.popup.external.suggest = Para sua segurança, deve apenas abrir ficheiros transferidos quando estiver offline, or usar um CD Tor Live como o Tails. +torbutton.popup.launch = Transferir ficheiro torbutton.popup.cancel = Cancelar -torbutton.popup.dontask = Sempre correr aplicações daqui para a frente +torbutton.popup.dontask = Transferir automaticamente ficheiros a partir de agora torbutton.popup.test.no_http_proxy = Teste ao proxy Tor: Erro na ligação ao proxy HTTP local. O Polipo está em execução? torbutton.popup.captcha.title = Evitar Captchas do Google? torbutton.popup.captcha.ask = O Torbutton detectou uma Captcha do Google. Pretende ser redireccionado para um novo motor de busca usando esta consulta? diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index aec58c5..5c7ef40 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Автоматический тест Tor pro torbutton.prefs.recommended = (рекомендуется) torbutton.prefs.optional = (по желанию) torbutton.prefs.crucial = (критично) -torbutton.popup.external.title = Загрузить внешние данные? -torbutton.popup.external.app = Внешняя прикладная программа необходима для обработки:\n\n -torbutton.popup.external.note = \n\nПРИМЕЧАНИЕ: Внешние приложения НЕ ЯВЛЯЮТСЯ безопасными для Tor по умолчанию, и могут разоблачить вас!\n -torbutton.popup.external.suggest = \nЕсли к этому файлу нет доверия, вы должны либо сохранить его на диск для просмотра при выключенном доступе к сети или в виртуальной машине,\nили рассмотреть возможность использования прозрачного Tor прокси типа Tails LiveCD или torsocks.\n -torbutton.popup.launch = Запустить приложение +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = Отменить -torbutton.popup.dontask = В будущем всегда запускать приложения +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor прокси-тест: Местные HTTP-прокси недоступны. Работает-ли Polipo должным образом? torbutton.popup.captcha.title = Избегать Google Captcha? torbutton.popup.captcha.ask = Torbutton обнаружил Google Captcha. Перенаправить запрос на другую поисковую систему? diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 0a13a4e..9648386 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Den automatiska Tor proxy misslyckades att an torbutton.prefs.recommended = (rekommenderat) torbutton.prefs.optional = (valfritt) torbutton.prefs.crucial = (kritiskt) -torbutton.popup.external.title = Fyll externt innehåll? -torbutton.popup.external.app = En extern applikation för att hantera:\n\n -torbutton.popup.external.note = \n\nOBS: Externa program är INTE Tor säkra som standard och kan avslöja dig!\n -torbutton.popup.external.suggest = \nOm denna fil är inte tillförlitlig, bör du spara antingen den för att visa offline eller i en VM,\neller överväga att använda en transparent Tor proxy som Tails LiveCD eller torsocks.\n -torbutton.popup.launch = Starta program +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = Avbryt -torbutton.popup.dontask = Alltid starta program från och med nu +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor proxy test: Lokal HTTP Proxy är onåbar. Är Polipo igång ordentligt? torbutton.popup.captcha.title = Undvik Google Captchas? torbutton.popup.captcha.ask = Torbutton upptäckte en Google Captcha. Vill du att omdirigeras till en annan sökmotor för den här frågan? diff --git a/src/chrome/locale/tr/torbutton.properties b/src/chrome/locale/tr/torbutton.properties index e7a3b1c..7dc2a90 100644 --- a/src/chrome/locale/tr/torbutton.properties +++ b/src/chrome/locale/tr/torbutton.properties @@ -1,10 +1,10 @@ -torbutton.button.tooltip.disabled = Tor'u etkinleştir. -torbutton.button.tooltip.enabled = Tor'u pasifleştir -torbutton.panel.tooltip.disabled = Tor'u aktif etmek için tıklayın -torbutton.panel.tooltip.enabled = Tor'u pasif hale getirmek için tıklayın +torbutton.button.tooltip.disabled = Tor'u Etkinleştir +torbutton.button.tooltip.enabled = Tor'u Devre Dışı Bırak +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 -torbutton.panel.plugins.enabled = Eklentileri pasif hale getirmek için tıklayın -torbutton.panel.label.disabled = Tor Devredışı +torbutton.panel.plugins.enabled = Eklentileri devre dışı bırakmak için tıklayın +torbutton.panel.label.disabled = Tor Devre Dışı torbutton.panel.label.enabled = Tor Etkin extensions.torbutton(a)torproject.org.description = Torbutton Tor ayarlarını yapabileceğiniz ve hızlı ve kolayca gizli tarama verilerini silebileceğiniz bir düğme sağlar. torbutton.popup.history.warning = Torbutton, farklı bir Tor durumunda yüklenmiş bir sekmeden gelen etkinliği engelledi.\n\nBu Firefox 409737 ve 417869 nolu hata raporlarını için bir çözümdür.\n\nHiçbir sebep yokken bu uyarı aldıysanız, muhtelemelen sekme kendini yenilemeye çalıştığı için engellenmiş olabilir.\n\nSekmeyi yenilemek için lütfen adres çubuğunu tıklayıp 'enter' tuşuna basın.\n\n @@ -12,23 +12,23 @@ torbutton.popup.plugin.warning = Torbutton Tor'un eklenti içeriğini yüklemesi torbutton.popup.confirm_ca_certs = Torbuton hatırlatma: Anlaşılan özel sertifakanız yok. Doğrulama bilgisi her zaman işlemleri yavaşlatır. Sertifika doğrulamalarını devredışı bırakmak ister misiniz? (Açıklamayı anlamadıysan, Tamam'a tıkla)\n torbutton.popup.ff3.warning = Dikkat!\n\nFirefox 3'teki Torbuton yerel saatinizi bazı yerel bilgilerinizi gizlice gönderebilir?\n\nDevam etmek istiyor musunuz? torbutton.popup.toggle.warning = Ayarların uygulanması için Tor'u yeniden başlatmanız gerekiyor.\n -torbutton.popup.test.success = Proxy testi başarılı! -torbutton.popup.test.failure = Proxy testi başarısız oldu!Lütfen proxyinizi,Polippo ayarlarını kontrol ediniz. -torbutton.popup.test.confirm_toggle = Proxy başlatılamadı\n\nGenede başlatmak istermisin?\n\nNot: Problem çözüldüyse, tekrar proxy testini başlatıp, bu uyarı devredışı bırakabilirsin. -torbutton.popup.test.ff3_notice = Tamama tıklayarak proxy ayarlarını test edin. Test arkaplanda gerçekleşiyor.Lütfen bekleyin. +torbutton.popup.test.success = Vekil sunucu testi başarılı! +torbutton.popup.test.failure = Vekil sunucu testi başarısız oldu! Lütfen Vekil sunucunuzu ve Polippo ayarlarını kontrol ediniz. +torbutton.popup.test.confirm_toggle = En son Tor vekil sunucu testi Tor kullanımında başarısız oldu.\n\nYine de etkinleştirmek ister misiniz?\n\nNot: Eğer sorunu çözdüyseniz bu uyarıyı yok etmek için Torbutton Vekil Sunucu Tercihlerinden sınamayı tekrar çalıştırabilirsiniz. +torbutton.popup.test.ff3_notice = Tamam tıklayarak vekil sunucu ayarlarını test edin. Bu sınama arkaplanda yapılacak. Lütfen sabırlı olun. torbutton.panel.label.verified = Doğrulandı -torbutton.popup.test.auto_failed = Otomatik gerçekleşen proxy testi başarız oldu.\n\nDevam etmek ister misiniz? +torbutton.popup.test.auto_failed = Otomatik gerçekleşen vekil sunucu Tor kullanma testi başarız oldu.\n\nYine de etkinleştirmek ister misiniz? torbutton.prefs.recommended = (tavsiye edilir) torbutton.prefs.optional = (isteğe bağlı) -torbutton.prefs.crucial = = -torbutton.popup.external.title = = -torbutton.popup.external.app = Kullanmak için harici bir uygulama seç:\n\n -torbutton.popup.external.note = \n\nNOT: Başka bir uyguluma sizin için güvenli olmayabilir!\n\n -torbutton.popup.external.suggest = \nBu dosya güvenli değilse, ona internete bağlı değilken veya VM icinde kaydedin,\nya da Tails LiveCD gibi şeffaf bir Tor proxy veya torsocks tercih edin.\n -torbutton.popup.launch = Uygulamayı çalıştır\n +torbutton.prefs.crucial = (önemli) +torbutton.popup.external.title = Harici bir dosya türü indirilsin mi? +torbutton.popup.external.app = Tor Tarayıcı bu dosyayı görüntüleyemiyor. Başka bir uygulamayla açmanız gerekecek.\n\n +torbutton.popup.external.note = Bazı dosya türleri, uygulamaların Tor kullanmaksızın İnternet'e bağlanmalarına sebep olabilir.\n\n +torbutton.popup.external.suggest = Güvende olmak için, indirilen dosyaları sadece çevrimdışı iken açmalı veya Tails benzeri bir Tor Çalışır CD kullanmalısınız.\n +torbutton.popup.launch = Dosyayı indir torbutton.popup.cancel = İptal\n -torbutton.popup.dontask = Şu andan itibaren uygulamayı sürekli çalıştır\r\n -torbutton.popup.test.no_http_proxy = Proxy test: Yerel proxy'e ulaşımıyor. Polippo düzgün çalışıyormu?\n +torbutton.popup.dontask = Artık dosyaları otomatik indir +torbutton.popup.test.no_http_proxy = Vekil sunucu sınaması: Yerel vekil sunucuya ulaşımıyor. Polippo düzgün çalışıyormu? torbutton.popup.captcha.title = Google Captchas'ı atla torbutton.popup.captcha.ask = Google Captcha algılandı. Aramana devam etmek için başka bir arama moturuna yönlendirmek istermisin? torbutton.popup.captcha.always = Bu ayarı şu andan itibaren sürekli hale getir\n @@ -52,4 +52,4 @@ canvas.siteprompt=Bu web sitesi (%S) canvas'daki resim verisini erişmeye çalı canvas.allow=Gelecekte izin ver canvas.allowAccessKey=H canvas.never=Bu site için asla -canvas.neverAccessKey=e +canvas.neverAccessKey=a diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties index 375aa35..d500589 100644 --- a/src/chrome/locale/vi/torbutton.properties +++ b/src/chrome/locale/vi/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Thử nghiệm proxy Tor tự động đã b torbutton.prefs.recommended = (khuyến cáo) torbutton.prefs.optional = (phụ) torbutton.prefs.crucial = (cấp thiết) -torbutton.popup.external.title = Nạp nội dung bên ngoài? -torbutton.popup.external.app = Một ứng dụng bên ngoài cần có để xử lý:\n\n -torbutton.popup.external.note = \n\nLƯU Ý: Các ứng dụng bên ngoài không an toàn cho Tor theo mặc định và có thể làm lộ chân tướng bạn!\n -torbutton.popup.external.suggest = \nNếu tập tin này không an toàn, bạn nên lưu nó lại để sử dụng khi \nkhông kết nối mạng hoặc trong máy ảo.\nhoặc cân nhắc sử dụng môi trường hoàn toàn dùng Tor proxy như Tails LiveCD hoặc torsocks.\n -torbutton.popup.launch = Khởi chạy ứng dụng +torbutton.popup.external.title = Download an external file type? +torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n +torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n +torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n +torbutton.popup.launch = Download file torbutton.popup.cancel = Hủy bỏ -torbutton.popup.dontask = Luôn luôn khởi chạy các ứng dụng kể từ bây giờ +torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Thử nghiệm Tor ủy nhiệm: HTTP ủy nhiệm địa phương không thể tới được. Polipo có đang chạy đúng cách không? torbutton.popup.captcha.title = Muốn tránh xác nhận Google Captchas? torbutton.popup.captcha.ask = Torbutton phát hiện có Google Captchas. Bạn có muồn chuyển qua bộ máy tìm kiếm khác cho câu hỏi này? diff --git a/src/chrome/locale/zh-CN/torbutton.properties b/src/chrome/locale/zh-CN/torbutton.properties index e5c905a..cb46ace 100644 --- a/src/chrome/locale/zh-CN/torbutton.properties +++ b/src/chrome/locale/zh-CN/torbutton.properties @@ -21,13 +21,13 @@ torbutton.popup.test.auto_failed = Tor 未通过自动代理测试。\n\n您确 torbutton.prefs.recommended = (推荐) torbutton.prefs.optional = (可选) torbutton.prefs.crucial = (重要) -torbutton.popup.external.title = 载入外部内容？ -torbutton.popup.external.app = 需要外部程序来处理:\n\n -torbutton.popup.external.note = \n\n注意：Tor 不能使外部程序的访问安全，可能泄露您的身份！\n -torbutton.popup.external.suggest = \n如果此文件不受信任，建议保存后断网浏览，或在虚拟机中查看，\n或者考虑使用 Tor 透明代理，例如 Tails 光盘系统或 Torsocks。\n -torbutton.popup.launch = 启动程序 +torbutton.popup.external.title = 下载一个外部文件类型？ +torbutton.popup.external.app = Tor Browser 无法显示此文件。您需要用其他应用程序打开它。\n\n +torbutton.popup.external.note = 部分文件类型可能会导致应用程序在不使用 Tor 的情况下连接互联网。\n\n +torbutton.popup.external.suggest = 为了安全起见，您应该只在离线状态下打开下载的文件，或者使用 Tor Live CD，例如 Tails。\n +torbutton.popup.launch = 下载文件 torbutton.popup.cancel = 取消 -torbutton.popup.dontask = 此后总是启动程序 +torbutton.popup.dontask = 自动下载文件于 torbutton.popup.test.no_http_proxy = Tor 代理测试：本地 HTTP 代理不可达，您的 Polipo 正常启动了吗？ torbutton.popup.captcha.title = 避免 Google Captchas？ torbutton.popup.captcha.ask = Torbutton 检测到了一个 Google Captcha，您是否愿意把本次搜索重定向到使用其他搜索引擎？

1 0

[torbutton/master] Update changelog and rdf for 1.6.9.0.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 453ef7ffd7a3423edea20b9268f9867579f38be8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 10:46:12 2014 -0700 Update changelog and rdf for 1.6.9.0. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e5b7c62..edf33dd 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.9.0: + 25 Apr 2014 + * Bug 7439: Improve download warning dialog text. + * Bug 11384: Completely remove hidden toggle menu item. + 1.6.8.0: 7 Apr 2014: * Bug 9010: Add Turkish to update locales. diff --git a/src/install.rdf b/src/install.rdf index 87db08f..428595d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.8.1</em:version> + <em:version>1.6.9.0</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-launcher/master] Bump version for 0.2.5.4.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 2adfdeec19eb64954cc8991fe0a3b75e710f3867 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 10:38:51 2014 -0700 Bump version for 0.2.5.4. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7b47f07..495b8ca 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.5.4pre</em:version> + <em:version>0.2.5.4</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

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

25 Apr '14

commit eed30d03d66166b5e0bc4c38ede9df2b73c8254e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 10:38:18 2014 -0700 Update translations. --- src/chrome/locale/bg/network-settings.dtd | 40 +++++++++++++-------------- src/chrome/locale/cy/torlauncher.properties | 2 +- src/chrome/locale/nl/torlauncher.properties | 2 +- src/chrome/locale/pl/torlauncher.properties | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index a38b198..2ad9e78 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -2,27 +2,27 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Преди да се свържете към Tor мрежата,вие трябва да предоставите информация относно интернет връзката на този компютър"> <!ENTITY torSettings.yes "Да"> <!ENTITY torSettings.no "Не"> -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.firstQuestion "Кое от следните описва най-добре вашата ситуация?"> +<!ENTITY torSettings.configurePrompt1 "Интернет връзката на този компютър е цензурирана,филтрирана или преминава през прокси."> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.configure "Конфигурирай"> +<!ENTITY torSettings.connectPrompt2 "Бих искал да се свържа директно към Tor мрежата."> +<!ENTITY torSettings.connectPrompt3 "Това ще работи при повечето ситуации."> <!ENTITY torSettings.connect "Свържи се"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> +<!ENTITY torSettings.proxyQuestion "Нуждае ли се този компютър от прокси за свързване към Интернет?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.proxyHelp "Ако не сте сигурни как да отговорите на този въпрос проверете интернет настройките на друг браузър,за да видите дали е настроен да използва прокси."> +<!ENTITY torSettings.enterProxy "Въведете настройките за прокси."> +<!ENTITY torSettings.firewallQuestion "Интернет връзката на този компютър преминава ли през firewall,който позволява връзки към определени портове?"> +<!ENTITY torSettings.firewallHelp "Ако не сте сигурни как да отговорите на въпроса,изберете Не.Ако срещнете проблеми при свързване към Tor мрежата променете тези настройки."> +<!ENTITY torSettings.enterFirewall "Въведете списък с портове разделени със запетая,които са позволени от firewall."> +<!ENTITY torSettings.bridgeQuestion "Блокирани или цензурирани ли са връзките към Tor Мрежата от вашият Интернет Доставчик(ISP)?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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."> @@ -33,8 +33,8 @@ <!ENTITY torsettings.optional "Допълнителен"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Този компютър се нуждае от прокси за да се свърже към Интернет."> +<!ENTITY torsettings.useProxy.type "Прокси Тип:"> <!ENTITY torsettings.useProxy.address "Адрес:"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост"> <!ENTITY torsettings.useProxy.port "Порт:"> @@ -43,21 +43,21 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Този компютър се свързва през firewall,който позволява връзки само към определени портове."> <!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.checkbox "Моят Интернет Доставчик (ISP) блокира връзките към Tor мрежата"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "въведете адрес:порт"> <!ENTITY torsettings.copyLog "Копирай Tor лога в клипборда"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2Heading "През Web"> +<!ENTITY torsettings.bridgeHelp2 "Използвайте уеб браузър за да посетите https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> diff --git a/src/chrome/locale/cy/torlauncher.properties b/src/chrome/locale/cy/torlauncher.properties index 97c0389..f26cdfa 100644 --- a/src/chrome/locale/cy/torlauncher.properties +++ b/src/chrome/locale/cy/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=anghysondeb hunaniaeth torlauncher.bootstrapWarning.timeout=cysylltiad goramser torlauncher.bootstrapWarning.noroute=ddim llwybr i'r cad torlauncher.bootstrapWarning.ioerror=camgymeriad darllen/sgwennu -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=trafnyddiaeth plygadwy ar goll diff --git a/src/chrome/locale/nl/torlauncher.properties b/src/chrome/locale/nl/torlauncher.properties index c4b2760..f104345 100644 --- a/src/chrome/locale/nl/torlauncher.properties +++ b/src/chrome/locale/nl/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identiteitsfout torlauncher.bootstrapWarning.timeout=verbindingstimeout torlauncher.bootstrapWarning.noroute=geen route naar de server torlauncher.bootstrapWarning.ioerror=lees/schrijffout -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=ontbrekend plugbaar vervoer diff --git a/src/chrome/locale/pl/torlauncher.properties b/src/chrome/locale/pl/torlauncher.properties index 7651ef2..32feaa8 100644 --- a/src/chrome/locale/pl/torlauncher.properties +++ b/src/chrome/locale/pl/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=niezgodność tożsamości torlauncher.bootstrapWarning.timeout=upłynął czas połączenia torlauncher.bootstrapWarning.noroute=brak trasy do hosta torlauncher.bootstrapWarning.ioerror=błąd zapisu/odczytu -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=brak podłączanego transportu

1 0

[tor-browser/tor-browser-24.5.0esr-1] fixup! fix #9308 and #11433: don't leak user install path of TBB
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 0806951f373ae1b0223229605ca6cca62f7464bd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 14:46:39 2014 +0200 fixup! fix #9308 and #11433: don't leak user install path of TBB Fix a memory leak, and add a couple length checks for extra safety. The length checks appear to be redundant to internal nsCString checks, but the string classes are such a mess of indirection, size, length, and char type templates that we might as well double-check first. --- js/xpconnect/src/XPCException.cpp | 1 + xpcom/build/Omnijar.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/xpconnect/src/XPCException.cpp b/js/xpconnect/src/XPCException.cpp index 1e42662..bb4064a 100644 --- a/js/xpconnect/src/XPCException.cpp +++ b/js/xpconnect/src/XPCException.cpp @@ -298,6 +298,7 @@ nsXPCException::Initialize(const char *aMessage, nsresult aResult, const char *a nsAutoCString resourceFilename; mozilla::Omnijar::ConvertToResourceFilename(nsCString(rawFilename), resourceFilename); mFilename = (char *) nsMemory::Clone(resourceFilename.get(), resourceFilename.Length()+1); + nsMemory::Free(rawFileName); // allocated by GetFilename if (NS_FAILED(rc = aLocation->GetLineNumber(&mLineNumber))) return rc; } else { diff --git a/xpcom/build/Omnijar.cpp b/xpcom/build/Omnijar.cpp index 79fa163..36602a7 100644 --- a/xpcom/build/Omnijar.cpp +++ b/xpcom/build/Omnijar.cpp @@ -167,9 +167,10 @@ Omnijar::GetURIString(Type aType, nsACString &result) bool Omnijar::RebaseFilename(const nsCString& filename, const nsCString& oldBase, const nsCString& newBase, nsACString &result) { PRInt32 pos = filename.Find(oldBase); - if (pos > -1) { + PRInt32 pathLen = filename.Length() - pos - oldBase.Length(); + if (pos > -1 && pathLen > -1 && pathLen <= filename.Length()) { nsAutoCString path; - filename.Right(path, filename.Length() - pos - oldBase.Length()); + filename.Right(path, pathLen); result = newBase + path; return true; }

1 0

[tor-browser/tor-browser-24.5.0esr-1] fix #9308 and #11433: don't leak user install path of TBB
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 7ac088b732719d6e69466e583b7eb31767759d22 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Apr 23 16:05:48 2014 -0700 fix #9308 and #11433: don't leak user install path of TBB --- js/xpconnect/src/XPCConvert.cpp | 5 ++++- js/xpconnect/src/XPCException.cpp | 7 ++++++- js/xpconnect/src/XPCStack.cpp | 7 +++++-- xpcom/build/Omnijar.cpp | 29 +++++++++++++++++++++++++++++ xpcom/build/Omnijar.h | 13 +++++++++++++ 5 files changed, 57 insertions(+), 4 deletions(-) diff --git a/js/xpconnect/src/XPCConvert.cpp b/js/xpconnect/src/XPCConvert.cpp index a94a519..dd8c8f4 100644 --- a/js/xpconnect/src/XPCConvert.cpp +++ b/js/xpconnect/src/XPCConvert.cpp @@ -8,6 +8,7 @@ /* Data conversion between native and JavaScript types. */ #include "mozilla/Util.h" +#include "mozilla/Omnijar.h" #include "xpcprivate.h" #include "nsString.h" @@ -1319,9 +1320,11 @@ XPCConvert::JSErrorToXPCException(const char* message, static_cast<const PRUnichar*>(report->uclinebuf); data = new nsScriptError(); + nsAutoCString resourceFilename; + Omnijar::ConvertToResourceFilename(nsCString(report->filename), resourceFilename); data->InitWithWindowID( bestMessage, - NS_ConvertASCIItoUTF16(report->filename), + NS_ConvertASCIItoUTF16(resourceFilename.get()), uclinebuf ? nsDependentString(uclinebuf) : EmptyString(), report->lineno, report->uctokenptr - report->uclinebuf, report->flags, diff --git a/js/xpconnect/src/XPCException.cpp b/js/xpconnect/src/XPCException.cpp index a0b48c2..1e42662 100644 --- a/js/xpconnect/src/XPCException.cpp +++ b/js/xpconnect/src/XPCException.cpp @@ -9,6 +9,7 @@ #include "xpcprivate.h" #include "nsError.h" #include "nsIUnicodeDecoder.h" +#include "mozilla/Omnijar.h" /***************************************************************************/ /* Quick and dirty mapping of well known result codes to strings. We only @@ -291,8 +292,12 @@ nsXPCException::Initialize(const char *aMessage, nsresult aResult, const char *a // For now, fill in our location details from our stack frame. // Later we may allow other locations? nsresult rc; - if (NS_FAILED(rc = aLocation->GetFilename(&mFilename))) + char* rawFilename = nullptr; + if (NS_FAILED(rc = aLocation->GetFilename(&rawFilename))) return rc; + nsAutoCString resourceFilename; + mozilla::Omnijar::ConvertToResourceFilename(nsCString(rawFilename), resourceFilename); + mFilename = (char *) nsMemory::Clone(resourceFilename.get(), resourceFilename.Length()+1); if (NS_FAILED(rc = aLocation->GetLineNumber(&mLineNumber))) return rc; } else { diff --git a/js/xpconnect/src/XPCStack.cpp b/js/xpconnect/src/XPCStack.cpp index db30556..adfd456 100644 --- a/js/xpconnect/src/XPCStack.cpp +++ b/js/xpconnect/src/XPCStack.cpp @@ -7,6 +7,7 @@ /* Implements nsIStackFrame. */ #include "xpcprivate.h" +#include "mozilla/Omnijar.h" class XPCJSStackFrame : public nsIStackFrame { @@ -107,9 +108,11 @@ XPCJSStackFrame::CreateStack(JSContext* cx, XPCJSStackFrame** stack) JSAutoCompartment ac(cx, desc->frames[i].script); const char* filename = JS_GetScriptFilename(cx, desc->frames[i].script); if (filename) { + nsAutoCString resourceFilename; + mozilla::Omnijar::ConvertToResourceFilename(nsCString(filename), resourceFilename); self->mFilename = (char*) - nsMemory::Clone(filename, - sizeof(char)*(strlen(filename)+1)); + nsMemory::Clone(resourceFilename.get(), + sizeof(char)*(resourceFilename.Length()+1)); } self->mLineno = desc->frames[i].lineno; diff --git a/xpcom/build/Omnijar.cpp b/xpcom/build/Omnijar.cpp index 4d75c7e..79fa163 100644 --- a/xpcom/build/Omnijar.cpp +++ b/xpcom/build/Omnijar.cpp @@ -164,4 +164,33 @@ Omnijar::GetURIString(Type aType, nsACString &result) return NS_OK; } +bool +Omnijar::RebaseFilename(const nsCString& filename, const nsCString& oldBase, const nsCString& newBase, nsACString &result) { + PRInt32 pos = filename.Find(oldBase); + if (pos > -1) { + nsAutoCString path; + filename.Right(path, filename.Length() - pos - oldBase.Length()); + result = newBase + path; + return true; + } + result = filename; + return false; +} + +void +Omnijar::ConvertToResourceFilename(const nsCString& filename, nsACString &result) { + if (StringBeginsWith(filename, NS_LITERAL_CSTRING("file://")) + || StringBeginsWith(filename, NS_LITERAL_CSTRING("jar:"))) { + if (RebaseFilename(filename, NS_LITERAL_CSTRING("/browser/omni.ja!/"), + NS_LITERAL_CSTRING("resource://app/"), result)) { + return; + } + if (RebaseFilename(filename, NS_LITERAL_CSTRING("/omni.ja!/"), + NS_LITERAL_CSTRING("resource://gre/"), result)) { + return; + } + } + result = filename; +} + } /* namespace mozilla */ diff --git a/xpcom/build/Omnijar.h b/xpcom/build/Omnijar.h index a261e35..4ba49a7 100644 --- a/xpcom/build/Omnijar.h +++ b/xpcom/build/Omnijar.h @@ -117,12 +117,25 @@ static already_AddRefed<nsZipArchive> GetReader(nsIFile *aPath); */ static nsresult GetURIString(Type aType, nsACString &result); +/** + * If the filename contains a "file://" URI, which is an absolute path, + * attempts to convert to a "resource://" URI. Otherwise returns the + * filename unchanged. + */ +static void ConvertToResourceFilename(const nsCString& filename, nsACString &result); + private: /** * Used internally, respectively by Init() and CleanUp() */ static void InitOne(nsIFile *aPath, Type aType); static void CleanUpOne(Type aType); +/** + * Rebases a filename, given a (possibly internal) base directory, and a new + * base directory name. E.g.: RebaseFilename("a/b/c","b","d",result) -> result = "d/c". + */ +static bool RebaseFilename(const nsCString& filename, const nsCString& oldBase, const nsCString& newBase, nsACString &result); + }; /* class Omnijar */

1 0

[tor-browser-bundle/master] Update fteproxy fingerprints, post heartbleed
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit 409a2634d95b0c0882f251cbb4b3e7b6002eb58f Author: Kevin P. Dyer <kpdyer(a)gmail.com> Date: Fri Apr 25 09:17:23 2014 -0700 Update fteproxy fingerprints, post heartbleed --- Bundle-Data/PTConfigs/bridge_prefs.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index bb000cd..f14cf07 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -19,7 +19,5 @@ pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5 pref("extensions.torlauncher.default_bridge.fte.1", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -// XXX: Fingerprints changed: -//pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); -//pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73"); - +pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09");

1 0

[tor-browser-bundle/master] Update the gitian branch we recommend people clone from.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit a97d04ef46c7ea6b35b9cfa961be3ce4db25a338 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 15:45:27 2014 +0200 Update the gitian branch we recommend people clone from. --- gitian/check-prerequisites.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh index b4df5a3..e470b84 100755 --- a/gitian/check-prerequisites.sh +++ b/gitian/check-prerequisites.sh @@ -27,7 +27,7 @@ then echo echo "Please run:" echo " cd ../../ " - echo " torsocks git clone -b tor-browser-builder-2 https://git.torproject.org/builders/gitian-builder.git" + echo " torsocks git clone -b tor-browser-builder-3 https://git.torproject.org/builders/gitian-builder.git" echo " cd -" exit 1 fi

1 0

[tor-browser-bundle/master] Update documentation and TODO file.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit e4d79c85701de21e6b15d6a0aba39b4931b4ba71 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 15:40:23 2014 +0200 Update documentation and TODO file. Some of the TODO file may still be out of date. I think we have fixed most of the hardening issues, for example, but we should double check that. --- gitian/README.build | 75 +++++++++++++++++++++++++++++---------------------- gitian/TODO | 7 ----- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index ece4cb6..47a8f57 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -48,18 +48,18 @@ Detailed Explanation of Scripts: 0. Makefile: The main Makefile. It has six main commands: - prep: Check OS prerequisites and download source dependency inputs - build: Build localized bundles for Linux, Windows, and Mac - - clean: Remove prior partial build stages (Tor and Firefox) + - clean: Remove prior partial build stages (see 'Partial Rebuilds' below) - vmclean: Remove VM base images - distclean: Remove source dependency inputs, and run clean and vmclean - all: The default. It calls clean, prep, and then build. - - sign: Signs your build output and uplodas it to people.torproject.org + - sign: Signs your build output and uploads it to people.torproject.org - match: Checks your build output against public signed hashes - To build alpha bundles, alternate targets are provided: - - alpha: The equivalent to the 'all' rule for alpha packages - - build-alpha: The equivalent to the 'build' rule for alpha packages - - prep-alpha: The equivalent to the 'prep' rule for alpha packages - - sign-alpha: Signs your build output and uplodas it to people.torproject.org - - match-alpha: Checks your build output against public signed hashes + To build beta/alpha/nightly bundles, alternate targets are provided: + - beta: The equivalent to the 'all' rule for beta packages + - build-beta: The equivalent to the 'build' rule for beta packages + - prep-beta: The equivalent to the 'prep' rule for beta packages + - sign-beta: Signs your build output and uploads it to people.torproject.org + - match-beta: Checks your build output against public signed hashes 1. check-prerequisites.sh: This script checks if your system is capable of running Gitian, and if it is not, it tells you what you need to do. @@ -95,31 +95,47 @@ Detailed Explanation of Scripts: call the appropriate descriptors to build a 32bit Mac bundle. It also will create build VM images for you if you haven't done that before. + 9. record-inputs.sh: This script records all of the hashes and bundle + inputs for inclusion in the 'Docs/sources' subdirectory of the bundles + themselves. + + 10. hash-bundles.sh: This script generates a 'sha256sums.txt' file in sorted, + reproducible order. -Partial Rebuilds: + 11. check-match.sh: This script checks your 'sha256sums.txt' file against + any signed, published builds. - The mkbundle shell scripts each have three Gitian stages. + 12. upload-signature.sh: This script signs and uploads your 'sha256sums.txt' + file (for use if you are an official builder). - First, using their platform's gitian-tor.yml Gitian descriptor, they build - tor and the tor dependencies (libevent, zlib, and openssl). Second, using - the gitian-firefox.yml descriptor, they build Firefox with the Tor Browser - patches and preferences applied. Third, in gitian-bundle.yml, they assemble - the bundles using the addons and localization packs. - The Tor and Firefox stages end up as a *gbuilt*.zip files in - ../../gitian-builder/inputs/, and those zip files are used as inputs into - the final bundling and localization stage. If those files exist in that - directory, the corresponding bundle will *not* be built. +Partial Rebuilds: + + The mkbundle shell scripts each have five Gitian stages: + 1. Build support utilities (gitian-utils.yml) + 2. Tor (gitian-tor.yml) + 3. Tor Browser (gitian-firefox.yml) + 4. Pluggable Transports (gitian-pluggable-transports.yml) + 5. Addon and bundle package assembly (gitian-bundle.yml) + + Each stage leaves build artifacts in ../../gitian-builder/inputs/ for use + in later stages. If the artifact files for a given stage are present, that + stage is skipped by a 'make build'. No other dependency checking on build stages is performed. - This means that if any of the source inputs, or the Ubuntu buildchain tools, - or the build tools' dependencies upgrade, your Tor and Firefox inputs will - no longer match those produced by someone else's build from a fresher VM - that downloaded those newer toolchain packages. + If you wish to rebuild only a given stage, there are several 'make clean-' + targets to remove the artifacts for that stage. Running a subsequent + 'make build' after that will rebuild only those targets that have been + cleaned, and then re-package everything again as well. + + Note that if any of the source inputs, or the Ubuntu buildchain tools, or + the build tools' dependencies upgrade, your Tor and Firefox inputs will + no longer match those produced by someone else's build from a fresh build + that downloaded those newer input, dependency, and toolchain packages. - This means for official builds, you should always run 'make clean' (which - is called by the default Makefile target). + This means for official builds, it is a good idea to always run a full + 'make clean' first, or just run 'make'. Known Issues and Quirks: @@ -138,7 +154,8 @@ Known Issues and Quirks: VMs) or 'rm ../../gitian-builder/*lucid*' (to remove the Linux VMs). You probably want to make sure you have no stray qemu processes before - rebuilding the VMs or starting a new build, too. + rebuilding the VMs or starting a new build, too. 'killall qemu-kvm' is + your friend. Once you get a working set of base VMs (in ../../gitian-builder/base-*), you should probably copy them somewhere safe if you want to avoid VM @@ -166,12 +183,6 @@ Known Issues and Quirks: SSH keys of the previous instances' VM, and VM startup will either hang or prompt you for an SSH password). - 6. The number of cpus in the VM images is currently hardcoded at 4. If you - need a different number, please let me know and I will write a patch to - support configuring the number of CPUs easily. - - 7. LXC-built bundles are still not deterministic and may run into other issues. - See TODO file for details. Diagnosing Problems: diff --git a/gitian/TODO b/gitian/TODO index cda7f32..47a1b6f 100644 --- a/gitian/TODO +++ b/gitian/TODO @@ -20,7 +20,6 @@ Short Term: - Refuse to build if `git diff --raw` is non-zero? - Detect arch on Linux - https://trac.torproject.org/projects/tor/ticket/3841 - - Too many libevent libs are included.. Only need a couple Mid Term: - Write a VM test+rebuild script @@ -36,8 +35,6 @@ Mid Term: - Clean up old paths (requires Tor Launcher commits) - Remove FirefoxPortable paths for Windows - Relocate torrc to Library/Tor for MacOS - - DMGs for Mac - https://trac.torproject.org/projects/tor/ticket/4261 - Universal binaries for Mac? - Usability win, but gettor loss (we're at 23M right now) - https://developer.mozilla.org/en-US/docs/Mac_OS_X_Universal_Binaries @@ -48,10 +45,6 @@ Mid Term: - Fix windows issues: - Link to DirectX via Wine (for WebGL) - Weird C++ stdext namespace issues remain :/ - - Accesibility still fails :/ - - https://bugzilla.mozilla.org/show_bug.cgi?id=815581 - - Has conflicts with FF17-ESR :/ - - Can we just pull the whole accessibility dir? - If Tor Launcher fails to load, the browser still can launch - Add browser code to detect missing addons? - Missing/Partial Localization strings can cause this..

1 0

[tor-browser-bundle/master] Also clean the bundle marker files if any stages get cleaned.
by mikeperry＠torproject.org 25 Apr '14

25 Apr '14

commit bc96dc6dfdd3be3872783dd68794fbb5a6023565 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Apr 25 15:39:27 2014 +0200 Also clean the bundle marker files if any stages get cleaned. If someone cleans a stage and then does 'make build', they probably also want to repackage everything after building that stage. --- gitian/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index b24ec53..c81e32c 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -77,20 +77,20 @@ clean: clean-utils clean-tor clean-browser clean-pt clean-bundle rm -f ../../gitian-builder/inputs/bundle.inputs rm -f ../../gitian-builder/inputs/versions* -clean-utils: +clean-utils: clean-bundle rm -f ../../gitian-builder/inputs/*utils.zip -clean-tor: +clean-tor: clean-bundle rm -f ../../gitian-builder/inputs/tor-linux* rm -f ../../gitian-builder/inputs/tor-mac* rm -f ../../gitian-builder/inputs/tor-win* -clean-browser: +clean-browser: clean-bundle rm -f ../../gitian-builder/inputs/tor-browser-linux* rm -f ../../gitian-builder/inputs/tor-browser-mac* rm -f ../../gitian-builder/inputs/tor-browser-win* -clean-pt: +clean-pt: clean-bundle rm -f ../../gitian-builder/inputs/pluggable-transports* clean-bundle:

1 0

[tor-browser-bundle/master] Fix broken nightly due to patch for bug 11200.
by gk＠torproject.org 25 Apr '14

25 Apr '14

commit 6da5650703e7c10f7592232df379963a44fee079 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 25 15:13:32 2014 +0000 Fix broken nightly due to patch for bug 11200. It seems the patch for bug 11200 does not apply cleanly to the latest tor master anymore. Make sure it gets only applied when 0.2.4 is used. --- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 5c4ae00..826d355 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -78,8 +78,8 @@ script: | git am ~/build/bug11069.patch git am ~/build/bug11156.patch git am ~/build/bug9665.patch + git am ~/build/bug11200.patch fi - git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 98668ac..c3ae8d8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -109,8 +109,8 @@ script: | git am ~/build/bug11069.patch git am ~/build/bug11156.patch git am ~/build/bug9665.patch + git am ~/build/bug11200.patch fi - git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ffac916..5e452b9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -105,8 +105,8 @@ script: | git am ~/build/bug11069.patch git am ~/build/bug11156.patch git am ~/build/bug9665.patch + git am ~/build/bug11200.patch fi - git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src

1 0

[tor-browser-bundle/master] Fix broken nightly due to patch for bug 9229.
by gk＠torproject.org 25 Apr '14

25 Apr '14

commit d984aa174e42c1a1919ed8a763ab33b095067278 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 25 11:46:35 2014 +0000 Fix broken nightly due to patch for bug 9229. It seems the patch for bug 9229 does not apply cleanly to the latest tor master anymore. Make sure it gets only applied when 0.2.4 is used. --- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 60a5015..5c4ae00 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -71,9 +71,9 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 3304f76..98668ac 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -102,9 +102,9 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ce4ef63..ffac916 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -98,9 +98,9 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch

1 0