- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 11200: Prevent spurious error message prior to enabling network.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 20b1a0c82f3d29b6d23f1de3e55a18ff74f54dcf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:51:32 2014 -0700 Bug 11200: Prevent spurious error message prior to enabling network. --- gitian/descriptors/linux/gitian-tor.yml | 2 ++ gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/windows/gitian-tor.yml | 5 +++- gitian/patches/bug11200.patch | 39 +++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), … [View More]1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 73181a0..bb795c0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug9229.patch" - "bug11156.patch" - "bug11069.patch" +- "bug11200.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -95,6 +96,7 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug11200.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 8b049b0..129a3fe 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" +- "bug11200.patch" - "bug11069.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" @@ -106,6 +107,7 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug11200.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 3d05eaa..5cceac9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" +- "bug11200.patch" - "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" @@ -102,7 +103,9 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - fi fi + git am ~/build/bug11200.patch + fi + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11200.patch b/gitian/patches/bug11200.patch new file mode 100644 index 0000000..040309a --- /dev/null +++ b/gitian/patches/bug11200.patch @@ -0,0 +1,39 @@ +From 6770153d4ced726e54305ad38d14ea82df0d639e Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Sat, 29 Mar 2014 21:49:32 -0700 +Subject: [PATCH] should_disable_dir_fetches() now returns 1 if + DisableNetwork==1 + +This change prevents LD_BUG warnings and bootstrap failure messages +when we try to do directory fetches when starting with +DisableNetwork == 1, a consensus present, but no descriptors (or +insufficient descriptors) yet. + +Fixes bug 11200 and bug 10405. It's a bugfix on 0.2.3.9-alpha. +Thanks to mcs for walking me through the repro instructions! +--- + src/or/networkstatus.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c +index bcadc52..9a1824b 100644 +--- a/src/or/networkstatus.c ++++ b/src/or/networkstatus.c +@@ -1394,6 +1394,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) + *msg_out = NULL; + } + ++ if (options->DisableNetwork) { ++ if (msg_out) { ++ *msg_out = "DisableNetwork is set."; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)"); ++ return 1; ++ } ++ + if (options->UseBridges) { + if (!any_bridge_descriptors_known()) { + if (msg_out) { +-- +1.8.1.2 + [View Less]

1 0

[tor-browser-bundle/master] Fix up backport application so that nightlies contain unmerged patches.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 440b4c5d059acfa744f9c12c9e3b13f81bbc6140 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:02:13 2014 -0700 Fix up backport application so that nightlies contain unmerged patches. --- gitian/descriptors/linux/gitian-tor.yml | 4 ++-- gitian/descriptors/mac/gitian-tor.yml | 4 ++-- gitian/descriptors/windows/gitian-tor.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/… [View More]gitian/descriptors/linux/gitian-tor.yml index bb795c0..698fcba 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -90,14 +90,14 @@ 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 - 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 129a3fe..30c23bb 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -101,14 +101,14 @@ 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 - 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 5cceac9..1698726 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -97,14 +97,14 @@ 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 - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src [View Less]

1 0

[tor-browser-bundle/master] Bug #11190: Switch linux PT build process to python2.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 843b30a1c9c1886feb563d151104b6e5494abd6e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:26:00 2014 -0700 Bug #11190: Switch linux PT build process to python2. Fixes arch and other distros that think 'python' should be python3. --- .../descriptors/linux/gitian-pluggable-transports.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/… [View More]descriptors/linux/gitian-pluggable-transports.yml index 665c9bd..6619a1c 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -42,6 +42,7 @@ script: | export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C + export PYTHON=python2 umask 0022 # # Config options for hardening-wrapper @@ -65,41 +66,41 @@ script: | # cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. # tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. # tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. # tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. # cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build + $PYTHON setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin mkdir -p $INSTDIR/Docs/Obfsproxy @@ -118,8 +119,8 @@ script: | tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build_ext --build-lib build --openssl $INSTDIR/openssl - python setup.py build --build-lib build + $PYTHON setup.py build_ext --build-lib build --openssl $INSTDIR/openssl + $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ cd .. # [View Less]

1 0

[torbutton/master] Bug #10398: Do not create untranslatable strings.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 54c8721acf3c52855405c669ebfbdbeead69806a Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 23 15:54:38 2014 -0500 Bug #10398: Do not create untranslatable strings. Our use of entities that contained trailing spaces was a bad idea: they got lost during the translation process. Instead, we now use a template that contains a snippet of HTML, with the search engine URLs as separate property strings. We did our best to preserve the … [View More]

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug10398'
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit a9a3b8f1cc3aeddbc0abc621ade08680ef09e146 Merge: 838c372 54c8721 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:18:10 2014 -0700 Merge remote-tracking branch 'brade/bug10398' Conflicts: src/chrome/content/aboutTor/aboutTor.xhtml src/chrome/locale/eu/aboutTor.dtd src/chrome/locale/fa/aboutTor.dtd src/chrome/locale/ja/aboutTor.dtd src/chrome/content/aboutTor/aboutTor.xhtml | 24 +++++++++++++++++++++++- src/chrome/… [View More]locale/af/aboutTor.dtd | 19 +------------------ src/chrome/locale/af/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ak/aboutTor.dtd | 19 +------------------ src/chrome/locale/ak/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/am/aboutTor.dtd | 19 +------------------ src/chrome/locale/am/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ar/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ar/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/arn/aboutTor.dtd | 19 +------------------ src/chrome/locale/arn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ast/aboutTor.dtd | 19 +------------------ src/chrome/locale/ast/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/az/aboutTor.dtd | 19 +------------------ src/chrome/locale/az/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/be/aboutTor.dtd | 19 +------------------ src/chrome/locale/be/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bg/aboutTor.dtd | 19 +------------------ src/chrome/locale/bg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bms/aboutTor.dtd | 19 +------------------ src/chrome/locale/bms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn-IN/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn-IN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bn/aboutTor.dtd | 19 +------------------ src/chrome/locale/bn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bo/aboutTor.dtd | 19 +------------------ src/chrome/locale/bo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/br/aboutTor.dtd | 19 +------------------ src/chrome/locale/br/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/bs/aboutTor.dtd | 19 +------------------ src/chrome/locale/bs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ca/aboutTor.dtd | 19 +------------------ src/chrome/locale/ca/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cs/aboutTor.dtd | 19 +------------------ src/chrome/locale/cs/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/csb/aboutTor.dtd | 19 +------------------ src/chrome/locale/csb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/cy/aboutTor.dtd | 19 +------------------ src/chrome/locale/cy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/da/aboutTor.dtd | 19 +------------------ src/chrome/locale/da/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/de/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/de/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/dz/aboutTor.dtd | 19 +------------------ src/chrome/locale/dz/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/el/aboutTor.dtd | 19 +------------------ src/chrome/locale/el/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/en/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/en/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eo/aboutTor.dtd | 19 +------------------ src/chrome/locale/eo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/es/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/es/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/et/aboutTor.dtd | 19 +------------------ src/chrome/locale/et/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/eu/aboutTor.dtd | 18 +----------------- src/chrome/locale/eu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fa/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fi/aboutTor.dtd | 19 +------------------ src/chrome/locale/fi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fil/aboutTor.dtd | 19 +------------------ src/chrome/locale/fil/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fo/aboutTor.dtd | 19 +------------------ src/chrome/locale/fo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fr/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/fr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fur/aboutTor.dtd | 19 +------------------ src/chrome/locale/fur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/fy/aboutTor.dtd | 19 +------------------ src/chrome/locale/fy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ga/aboutTor.dtd | 19 +------------------ src/chrome/locale/ga/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gl/aboutTor.dtd | 19 +------------------ src/chrome/locale/gl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gu/aboutTor.dtd | 19 +------------------ src/chrome/locale/gu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/gun/aboutTor.dtd | 19 +------------------ src/chrome/locale/gun/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ha/aboutTor.dtd | 19 +------------------ src/chrome/locale/ha/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/he/aboutTor.dtd | 19 +------------------ src/chrome/locale/he/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hi/aboutTor.dtd | 19 +------------------ src/chrome/locale/hi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hr/aboutTor.dtd | 19 +------------------ src/chrome/locale/hr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ht/aboutTor.dtd | 19 +------------------ src/chrome/locale/ht/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hu/aboutTor.dtd | 19 +------------------ src/chrome/locale/hu/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/hy/aboutTor.dtd | 19 +------------------ src/chrome/locale/hy/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/id/aboutTor.dtd | 19 +------------------ src/chrome/locale/id/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/is/aboutTor.dtd | 19 +------------------ src/chrome/locale/is/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/it/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/it/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ja/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ja/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/jv/aboutTor.dtd | 19 +------------------ src/chrome/locale/jv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ka/aboutTor.dtd | 19 +------------------ src/chrome/locale/ka/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/km/aboutTor.dtd | 19 +------------------ src/chrome/locale/km/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kn/aboutTor.dtd | 19 +------------------ src/chrome/locale/kn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ko/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ko/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ku/aboutTor.dtd | 19 +------------------ src/chrome/locale/ku/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/kw/aboutTor.dtd | 19 +------------------ src/chrome/locale/kw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ky/aboutTor.dtd | 19 +------------------ src/chrome/locale/ky/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lb/aboutTor.dtd | 19 +------------------ src/chrome/locale/lb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lg/aboutTor.dtd | 19 +------------------ src/chrome/locale/lg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ln/aboutTor.dtd | 19 +------------------ src/chrome/locale/ln/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lo/aboutTor.dtd | 19 +------------------ src/chrome/locale/lo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lt/aboutTor.dtd | 19 +------------------ src/chrome/locale/lt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/lv/aboutTor.dtd | 19 +------------------ src/chrome/locale/lv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mg/aboutTor.dtd | 19 +------------------ src/chrome/locale/mg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mi/aboutTor.dtd | 19 +------------------ src/chrome/locale/mi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mk/aboutTor.dtd | 19 +------------------ src/chrome/locale/mk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ml/aboutTor.dtd | 19 +------------------ src/chrome/locale/ml/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mn/aboutTor.dtd | 19 +------------------ src/chrome/locale/mn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mr/aboutTor.dtd | 19 +------------------ src/chrome/locale/mr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ms/aboutTor.dtd | 19 +------------------ src/chrome/locale/ms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/mt/aboutTor.dtd | 19 +------------------ src/chrome/locale/mt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/my/aboutTor.dtd | 19 +------------------ src/chrome/locale/my/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nah/aboutTor.dtd | 19 +------------------ src/chrome/locale/nah/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nap/aboutTor.dtd | 19 +------------------ src/chrome/locale/nap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nb/aboutTor.dtd | 19 +------------------ src/chrome/locale/nb/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ne/aboutTor.dtd | 19 +------------------ src/chrome/locale/ne/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/nl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nn/aboutTor.dtd | 19 +------------------ src/chrome/locale/nn/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/nso/aboutTor.dtd | 19 +------------------ src/chrome/locale/nso/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/oc/aboutTor.dtd | 19 +------------------ src/chrome/locale/oc/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/or/aboutTor.dtd | 19 +------------------ src/chrome/locale/or/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pa/aboutTor.dtd | 19 +------------------ src/chrome/locale/pa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pap/aboutTor.dtd | 19 +------------------ src/chrome/locale/pap/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pl/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pms/aboutTor.dtd | 19 +------------------ src/chrome/locale/pms/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ps/aboutTor.dtd | 19 +------------------ src/chrome/locale/ps/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt-BR/aboutTor.dtd | 19 +------------------ src/chrome/locale/pt-BR/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/pt/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/pt/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ro/aboutTor.dtd | 19 +------------------ src/chrome/locale/ro/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ru/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/ru/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sco/aboutTor.dtd | 19 +------------------ src/chrome/locale/sco/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sk/aboutTor.dtd | 19 +------------------ src/chrome/locale/sk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sl/aboutTor.dtd | 19 +------------------ src/chrome/locale/sl/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/so/aboutTor.dtd | 19 +------------------ src/chrome/locale/so/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/son/aboutTor.dtd | 19 +------------------ src/chrome/locale/son/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sq/aboutTor.dtd | 19 +------------------ src/chrome/locale/sq/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sr/aboutTor.dtd | 19 +------------------ src/chrome/locale/sr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/st/aboutTor.dtd | 19 +------------------ src/chrome/locale/st/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/su/aboutTor.dtd | 19 +------------------ src/chrome/locale/su/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sv/aboutTor.dtd | 19 +------------------ src/chrome/locale/sv/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/sw/aboutTor.dtd | 19 +------------------ src/chrome/locale/sw/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ta/aboutTor.dtd | 19 +------------------ src/chrome/locale/ta/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/te/aboutTor.dtd | 19 +------------------ src/chrome/locale/te/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tg/aboutTor.dtd | 19 +------------------ src/chrome/locale/tg/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/th/aboutTor.dtd | 19 +------------------ src/chrome/locale/th/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ti/aboutTor.dtd | 19 +------------------ src/chrome/locale/ti/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tk/aboutTor.dtd | 19 +------------------ src/chrome/locale/tk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/tr/aboutTor.dtd | 19 +------------------ src/chrome/locale/tr/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/uk/aboutTor.dtd | 19 +------------------ src/chrome/locale/uk/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ur/aboutTor.dtd | 19 +------------------ src/chrome/locale/ur/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/ve/aboutTor.dtd | 19 +------------------ src/chrome/locale/ve/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/vi/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/vi/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wa/aboutTor.dtd | 19 +------------------ src/chrome/locale/wa/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/wo/aboutTor.dtd | 19 +------------------ src/chrome/locale/wo/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-CN/aboutTor.dtd | 27 +-------------------------- src/chrome/locale/zh-CN/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-HK/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-HK/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zh-TW/aboutTor.dtd | 19 +------------------ src/chrome/locale/zh-TW/aboutTor.properties | 15 +++++++++++++++ src/chrome/locale/zu/aboutTor.dtd | 19 +------------------ src/chrome/locale/zu/aboutTor.properties | 15 +++++++++++++++ 239 files changed, 1927 insertions(+), 2262 deletions(-) diff --cc src/chrome/content/aboutTor/aboutTor.xhtml index 6efe617,02e0c7c..b99bc7e --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@@ -25,8 -25,10 +25,10 @@@ <![CDATA[ function onLoad() { + insertPropertyStrings(); + - window.addEventListener("resize", function() { - resizeToolbarIconArrow(); + document.addEventListener("AboutTorAdjustArrow", function() { + adjustToolbarIconArrow(); }, false); window.setTimeout( function() { @@@ -35,74 -37,36 +37,94 @@@ }, 0); } -function resizeToolbarIconArrow() +function adjustToolbarIconArrow() { var textElem = document.getElementById("updatePrompt"); - var rightDiv = document.getElementById("toolbarIconArrowRight"); - if (textElem && rightDiv) + var arrowDiv = document.getElementById("toolbarIconArrow"); + var extDiv = document.getElementById("toolbarIconArrowExtension"); + if (textElem && arrowDiv && extDiv) { - var width = textElem.offsetLeft - rightDiv.offsetLeft - 6; - rightDiv.style.width = width + "px"; + var tbXpos; + if (document.body.hasAttribute("torbutton-xpos")) + tbXpos = parseInt(document.body.getAttribute("torbutton-xpos"), 10); + + if (!tbXpos || isNaN(tbXpos) || (tbXpos < 0)) + { + arrowDiv.style.display = "none"; + extDiv.style.display = "none"; + return; + } + + // Account for content zoom and retina displays by converting to device + // independent units. + if ("devicePixelRatio" in window) // FF18+ + tbXpos /= window.devicePixelRatio; + + const kArrowMargin = 6; + arrowDiv.style.display = "block"; // Must be visible to get offsetWidth. + var arrowHalfWidth = arrowDiv.offsetWidth / 2.0; + var leftAnchor = textElem.offsetLeft - kArrowMargin - arrowHalfWidth; + var rightAnchor = textElem.offsetLeft + textElem.offsetWidth + + kArrowMargin + arrowHalfWidth; + + var arrowDisplay = "block"; + var extDisplay = "block"; + if (tbXpos < leftAnchor) + { + // Toolbar button to left of text. + arrowDiv.setAttribute("pos", "left"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + var extLeft = tbXpos + arrowHalfWidth; + extDiv.style.left = extLeft + "px"; + extDiv.style.width = (textElem.offsetLeft - extLeft - kArrowMargin) + "px"; + } + else if ((tbXpos > rightAnchor) && + (tbXpos < (window.innerWidth - arrowHalfWidth))) + { + // Toolbar button to right of text. + arrowDiv.setAttribute("pos", "right"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + var extLeft = rightAnchor - arrowHalfWidth; + extDiv.style.left = extLeft + "px"; + extDiv.style.width = (tbXpos - arrowHalfWidth - extLeft) + "px"; + } + else if ((tbXpos >= leftAnchor) && (tbXpos <= rightAnchor)) + { + // Toolbar button in middle about text; use arrow without a tail. + arrowDiv.setAttribute("pos", "middle"); + arrowDiv.style.left = (tbXpos - arrowHalfWidth) + "px"; + extDisplay = "none"; + } + else // Unable to display arrow (e.g., toolbar button is above sidebar). + { + arrowDisplay = "none"; + extDisplay = "none"; + } + + arrowDiv.style.display = arrowDisplay; + extDiv.style.display = extDisplay; } } + + function insertPropertyStrings() + { + try { + var kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; + + Components.utils.import("resource://gre/modules/Services.jsm"); + var gStringBundle = Services.strings.createBundle(kPropertiesURL); + var s1 = gStringBundle.GetStringFromName("aboutTor.searchSP.privacy.link"); + var s2 = gStringBundle.GetStringFromName("aboutTor.searchSP.search.link"); + var result = gStringBundle.formatStringFromName("aboutTor.searchSP.privacy", + [s1, s2], 2); + if (result) { + var elem = document.getElementById("searchProviderInfo"); + if (elem) + elem.innerHTML = result; + } + } catch(e) {}; + } + ]]> </script> </head> diff --cc src/chrome/locale/eu/aboutTor.dtd index 7b07102,9f14022..157346e --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@@ -21,53 -21,27 +21,37 @@@ <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "Search"> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.search.label "Bilatu"> + + +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> - <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Bilatu"> - <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Bilatu"> - <!ENTITY aboutTor.searchSP.privacy.label "segurtasunez"> - <!ENTITY aboutTor.searchDDG.privacy.label "segurtasunez"> - <!ENTITY aboutTor.searchSP.privacy.link "https://startpage.com/eng/protect-privacy.html"> - <!ENTITY aboutTor.searchDDG.privacy.link "https://duckduckgo.com/privacy.html"> - <!ENTITY aboutTor.searchSP.privacy.afterLink.label "&nbsp;"> - <!ENTITY aboutTor.searchDDG.privacy.afterLink.label "&nbsp;"> - <!ENTITY aboutTor.searchSP.search.beforeLink.label "rekin"> - <!ENTITY aboutTor.searchDDG.search.beforeLink.label "rekin"> - <!ENTITY aboutTor.searchSP.search.label "Startpage"> - <!ENTITY aboutTor.searchDDG.search.label "DuckDuckGo"> - <!ENTITY aboutTor.searchSP.search.link "https://startpage.com/"> - <!ENTITY aboutTor.searchDDG.search.link "https://duckduckgo.com/"> - <!ENTITY aboutTor.searchSP.search.afterLink.label "."> - <!ENTITY aboutTor.searchDDG.search.afterLink.label "."> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> +<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:"> +<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:"> +<!ENTITY aboutTor.torInfo3.label "Irteera nodoa:"> +<!ENTITY aboutTor.torInfo4.label "Ostalari honek ez du bisitarien inguruko inolako informaziorik biltzen."> +<!ENTITY aboutTor.whatnextQuestion.label "Eta orain zer?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko."> +<!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> +<!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!"> +<!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:"> +<!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> +<!ENTITY aboutTor.helpInfo4.label "Zure zerbitzuak bolondrestu »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Dohaintza egin »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa."> +<!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> [View Less]

1 0

[tor-browser-bundle/master] Bug #10383: Enable NIST P224 and P256 accel support for 64bit builds.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit e9a962ab77fe8f809da011dd944c965c2e038fc8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:03:50 2014 -0700 Bug #10383: Enable NIST P224 and P256 accel support for 64bit builds. --- gitian/descriptors/linux/gitian-tor.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f0cb682..73181a0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml … [View More]

1 0

[tor-browser-bundle/master] Bug #9010: Add Turkish to beta and alpha language codes.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit ef6fdf42854b083dca7163f63ab7533326c7ccad Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 20:56:33 2014 -0700 Bug #9010: Add Turkish to beta and alpha language codes. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 5adee9a..176477a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,5 @@ … [View More]

1 0

[tor-launcher/master] Add Turkish to bundle locales.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 06d3404cc2483a54a4f88c780cfa1b67aaead24a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 20:54:19 2014 -0700 Add Turkish to bundle locales. --- localization/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 8d30a7d..32ea177 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,6 @@ #!… [View More]

1 0

[torbutton/master] Add Turkish to update locales.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit 838c372986f122b2b5818deef088a98814efdb52 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 20:53:23 2014 -0700 Add Turkish to update locales. --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index e1cb721..c29ed4c 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # … [View More]

1 0

[torbutton/master] Bug #11242: Clear "update needed" after upgrade.
by mikeperry＠torproject.org 30 Mar '14

30 Mar '14

commit b9fb03cd4ff8ac8c23a10831b11c7e50275ea6bf Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Mar 26 14:57:39 2014 -0400 Bug #11242: Clear "update needed" after upgrade. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c7a8274..5642a4a 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.… [View More]js @@ -13,7 +13,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); +const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; +const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; // status @@ -449,14 +451,32 @@ function torbutton_init() { m_tb_ff36 = false; } + var cur_version; try { - var test = m_tb_prefs.getCharPref("torbrowser.version"); + cur_version = m_tb_prefs.getCharPref("torbrowser.version"); m_tb_tbb = true; torbutton_log(3, "This is a Tor Browser"); } catch(e) { torbutton_log(3, "This is not a Tor Browser: "+e); } + // If the Tor Browser version has changed since the last time Torbutton + // was loaded, reset the version check preferences in order to avoid + // incorrectly reporting that the browser needs to be updated. + var last_version; + try { + last_version = m_tb_prefs.getCharPref(k_tb_last_browser_version_pref); + } catch (e) {} + if (cur_version != last_version) { + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); + if (m_tb_prefs.prefHasUserValue(k_tb_last_update_check_pref)) { + m_tb_prefs.clearUserPref(k_tb_last_update_check_pref); + } + + if (cur_version) + m_tb_prefs.setCharPref(k_tb_last_browser_version_pref, cur_version); + } + // Bug 1506 P4: These vars are very important for New Identity var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); @@ -1041,12 +1061,11 @@ function torbutton_do_async_versioncheck() { } // Suppress update check if done recently. - const kLastCheckPref = "extensions.torbutton.lastUpdateCheck"; const kMinSecsBetweenChecks = 90 * 60; // 1.5 hours var now = Date.now() / 1000; var lastCheckTime; try { - lastCheckTime = parseFloat(m_tb_prefs.getCharPref(kLastCheckPref)); + lastCheckTime = parseFloat(m_tb_prefs.getCharPref(k_tb_last_update_check_pref)); if (isNaN(lastCheckTime)) lastCheckTime = undefined; } catch (e) {} @@ -1054,7 +1073,7 @@ function torbutton_do_async_versioncheck() { if (lastCheckTime && ((now - lastCheckTime) < kMinSecsBetweenChecks)) return; - m_tb_prefs.setCharPref(kLastCheckPref, now); + m_tb_prefs.setCharPref(k_tb_last_update_check_pref, now); torbutton_log(3, "Checking version with socks port: " +m_tb_prefs.getIntPref("extensions.torbutton.socks_port")); [View Less]

1 0