tbb-commits February 2016

tbb-commits@lists.torproject.org

1 participants
48 discussions

[tor-browser-bundle/master] Bumping NSIS_TAG due to git stupidity
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 4fdf888d8d829fe02ccbc3da5dba472c9d119dc9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:52:53 2016 +0000 Bumping NSIS_TAG due to git stupidity --- gitian/gpg/tbb-windows-installer.gpg | Bin 53000 -> 107882 bytes gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index 7193ea0..6923786 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f73c7f5..88cb0cb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -16,7 +16,7 @@ TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.9 TORBUTTON_TAG=1.9.5 HTTPSE_TAG=5.1.2 -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 85c103d..2344d40 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -23,7 +23,7 @@ TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master HTTPSE_TAG=master -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131

1 0

[tor-browser-bundle/master] Bumping nightly versions
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 49aa47ca2d1a975a5e25a791873da40fbef82336 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:54:50 2016 +0000 Bumping nightly versions --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 2344d40..419263f 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -14,7 +14,7 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=default @@ -65,7 +65,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -94,7 +94,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Release preparations for 6.0a2
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 499fecf76524da8f312279baac71e71979fc6c4b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 10:49:11 2016 +0000 Release preparations for 6.0a2 --- Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++++ gitian/versions.alpha | 6 +++--- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 5eabaa4..61df40c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 6.0a2 -- February 15 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + * OSX + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support + +Tor Browser 5.5.1 -- February 4 2016 + * All Platforms + * Bug 18168: Don't clear an iframe's window.name (fix of #16620) + * Bug 18137: Add two new obfs4 default bridges + * Windows + * Bug 18169: Whitelist zh-CN UI font + * OS X + * Bug 18172: Add Emoji support + * Linux + * Bug 18172: Add Emoji support + Tor Browser 6.0a1 -- January 27 2016 * All Platforms * Update Firefox to 38.6.0esr diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 91854b8..f73c7f5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=alpha @@ -58,7 +58,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -87,7 +87,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a0f5309..2827471 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -9,7 +9,7 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - alpha: 6.0a1 + alpha: 6.0a2 release: 5.5 versions: 5.5: @@ -23,12 +23,12 @@ versions: osx32: minSupportedOSVersion: 10.8 detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda… - 6.0a1: - platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-60a1-released - download_url: https://www.torproject.org/dist/torbrowser/6.0a1 + 6.0a2: + platformVersion: 38.6.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-released + download_url: https://www.torproject.org/dist/torbrowser/6.0a2 incremental_from: - - 5.5a6 + - 6.0a1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/maint-5.5] Tag bump due to expired subkey
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit cb2b281c633e0ac815340063b46c551496214024 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 09:57:12 2016 +0000 Tag bump due to expired subkey --- gitian/gpg/tbb-windows-installer.gpg | Bin 53000 -> 107882 bytes gitian/versions | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/gpg/tbb-windows-installer.gpg b/gitian/gpg/tbb-windows-installer.gpg index 7193ea0..6923786 100644 Binary files a/gitian/gpg/tbb-windows-installer.gpg and b/gitian/gpg/tbb-windows-installer.gpg differ diff --git a/gitian/versions b/gitian/versions index 334b6cc..7be32ff 100755 --- a/gitian/versions +++ b/gitian/versions @@ -16,7 +16,7 @@ TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 HTTPSE_TAG=5.1.2 -NSIS_TAG=v0.3 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131

1 0

[tor-browser-bundle/maint-5.5] Release preparations for 5.5.2
by gk＠torproject.org 11 Feb '16

11 Feb '16

commit 7a36dbece35a307675f396a019dccf6e431efb44 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 11 08:58:38 2016 +0000 Release preparations for 5.5.2 --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ gitian/versions | 8 ++++---- tools/update-responses/config.yml | 12 ++++++------ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 525d2b3..e257d11 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 5.5.2 -- February 12 2016 + * All Platforms + * Update Firefox to 38.6.1esr + * Update NoScript to 2.9.0.3 + Tor Browser 5.5.1 -- February 4 2016 * All Platforms * Bug 18168: Don't clear an iframe's window.name (fix of #16620) diff --git a/gitian/versions b/gitian/versions index 26e8cd2..334b6cc 100755 --- a/gitian/versions +++ b/gitian/versions @@ -7,11 +7,11 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=38.6.1esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.8 TORBUTTON_TAG=1.9.4.3 @@ -59,7 +59,7 @@ GO_VER=1.4.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -90,7 +90,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 470ee06..922cf7c 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,15 +10,15 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 5.5a6 - release: 5.5.1 + release: 5.5.2 versions: - 5.5.1: - platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-551-released - download_url: https://www.torproject.org/dist/torbrowser/5.5.1 + 5.5.2: + platformVersion: 38.6.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-552-released + download_url: https://www.torproject.org/dist/torbrowser/5.5.2 incremental_from: - - 5.0.7 - 5.5 + - 5.5.1 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser-bundle/hardened-builds] Bug 18198: Building the hardened series on Wheezy fails
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 00eca1bfd413174856b5eacfc97fd183a762f5da Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 1 20:27:16 2016 +0000 Bug 18198: Building the hardened series on Wheezy fails It seems using our own binutils for our utils leads to the breakage. Let's skip that for now. --- gitian/descriptors/linux/gitian-utils.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index a742c4e..1e3102f 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -60,7 +60,6 @@ script: | make $MAKEOPTS make install cd .. - export PATH=$INSTDIR/binutils/bin:$PATH # Building GCC tar xjf gcc.tar.bz2

1 0

[tor-browser-bundle/hardened-builds] Bump Gitian tag for building on Wheezy
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 1df2c463289264e9b6a44d7435ca26c69906c6bd Author: Georg Koppen <gk(a)torproject.org> Date: Mon Feb 1 20:40:32 2016 +0000 Bump Gitian tag for building on Wheezy --- gitian/versions.alpha | 2 +- gitian/versions.nightly | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 3f2df43..98881d5 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,7 +40,7 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 66ad9d1..876d00b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -43,7 +43,7 @@ GO_X_NET_TAG=master OBFS4_TAG=master NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-3.x-9 OPENSSL_VER=1.0.1q GMP_VER=5.1.3

1 0

[torbutton/maint-1.9.4] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit 3ccbfe38c767fb5d85ea37168ae08c297997b5ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() 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; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[torbutton/master] Bug 18144: about:tor update arrow position is wrong (Retina and zoom)
by gk＠torproject.org 08 Feb '16

08 Feb '16

commit b195514c21e5809f9afc8ec606e716d0e67865cc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Feb 1 14:48:22 2016 -0500 Bug 18144: about:tor update arrow position is wrong (Retina and zoom) For the about:tor content window, use nsIDOMWindowUtils.screenPixelsPerCSSPixel instead of window.devicePixelRatio to compensate for a retina display and for content zoom (devicePixelRatio always returns 1.0 for content windows due to the fix for bug 13875). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 +------ src/chrome/content/torbutton.js | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 6fdbe50..dbb8a89 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  @@ -59,11 +59,6 @@ function adjustToolbarIconArrow() 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; // Horizontal margin between line and text. const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. const kArrowLineThickness = 11; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0d1cfe8..25b61fb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1023,7 +1023,8 @@ function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) } // Determine X position of torbutton toolbar item and pass it through -// to the xhtml document. +// to the xhtml document by setting a torbutton-xpos attribute on the body. +// The value that is set takes retina displays and content zoom into account. function torbutton_update_abouttor_arrow(aDoc) { try { let tbXpos = -1; @@ -1033,15 +1034,22 @@ function torbutton_update_abouttor_arrow(aDoc) { let contentElem = document.getElementById("content"); let contentRect = contentElem.getBoundingClientRect(); if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - - contentElem.getBoundingClientRect().left; + tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; } } - if (tbXpos >= 0) { - if ("devicePixelRatio" in window) // FF18+ - tbXpos *= window.devicePixelRatio; // Convert to device pixels. - tbXpos = Math.round(tbXpos); + if (tbXpos >= 0) { + // Convert to device-independent units, compensating for retina display + // and content zoom that may be in effect on the about:tor page. + // Because window.devicePixelRatio always returns 1.0 for non-Chrome + // windows (see bug 13875), we use screenPixelsPerCSSPixel for the + // content window. + tbXpos *= window.devicePixelRatio; + let pixRatio = gBrowser.contentWindow + .QueryInterface(Ci.nsIInterfaceRequestor) + .getInterface(Ci.nsIDOMWindowUtils) + .screenPixelsPerCSSPixel; + tbXpos = Math.round(tbXpos / pixRatio); aDoc.body.setAttribute("torbutton-xpos", tbXpos); } else { aDoc.body.removeAttribute("torbutton-xpos");

1 0

[tor-browser-bundle/hardened-builds] Use UTC.
by gk＠torproject.org 05 Feb '16

05 Feb '16

commit 4e17d93d3b21dd6f33e8e0069981ac4abae3d658 Author: Linus Nordberg <linus(a)nordu.net> Date: Fri Feb 5 08:49:30 2016 +0100 Use UTC. --- tools/continuous-builds/build-tbb.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 6c8d248..f0ff132 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -48,7 +48,7 @@ MAKE_TARGET=$TARGET while [ $status != done ]; do n=$(expr $n + 1) printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile - date | tee -a $logfile + date -u | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $MAKE_TARGET > build-logs/build-$(date -u +%s).log && status=done printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile @@ -57,7 +57,7 @@ while [ $status != done ]; do done if [ $status = done ]; then - NEWDESTDIR=$DESTDIR-$(date +%F) + NEWDESTDIR=$DESTDIR-$(date -u +%F) echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 @@ -72,7 +72,7 @@ else FILES="$logfile \ ../../gitian-builder/var/build.log \ ../../gitian-builder/var/target.log" - tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date +%F)" \ + tail -n 50 $FILES | $MAILX -E -s "Nightly build failure -- $(date -u +%F)" \ $LOGSENDER -- $LOGRECIPIENTS fi fi

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits February 2016