- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Relocate recommended-versions file here.
by mikeperry＠torproject.org 26 Jul '14

26 Jul '14

commit a2370de2b0b44a22f3f2591c2960cd6767940b8b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 17:23:24 2014 -0700 Relocate recommended-versions file here. --- gitian/recommended-release-versions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gitian/recommended-release-versions b/gitian/recommended-release-versions new file mode 100644 index 0000000..13ba64a --- /dev/null +++ b/gitian/recommended-release-versions @@ -0,0 +1,5 @@ +[ +"3.6.3-Linux", +"3.6.3-MacOS", +"3.6.3-Windows" +]

1 0

[tor-browser-bundle/master] Add 3.6.2 and 3.6.3 back in to master branch changelog.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 6887900b9109b6b8f26c4a7738605a9b8bc332e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jul 25 16:26:14 2014 -0700 Add 3.6.2 and 3.6.3 back in to master branch changelog. --- Bundle-Data/Docs/ChangeLog.txt | 47 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ae14c46..ef2dd84 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 +Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * All Platforms * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Firefox to 24.7.0esr @@ -24,6 +24,51 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore +Tor Browser Bundle 3.6.3 -- Jul 24 2014 + * All Platforms + * Update Firefox to 24.7.0esr + * Update obfsproxy to 0.2.12 + * Update FTE to 0.2.17 + * Update NoScript to 2.6.8.33 + * Update HTTPS Everywhere to 3.5.3 + * Bug 12673: Update FTE bridges + * Update Torbutton to 1.6.11.0 + * Bug 12221: Remove obsolete Javascript components from the toggle era + * Bug 10819: Bind new third party isolation pref to Torbutton security UI + * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. + * Linux: + * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation + * Bug 12249: Don't create PT debug files anymore + +Tor Browser Bundle 3.6.2 -- Jun 9 2014 + * All Platforms + * Update Firefox to 24.6.0esr + * Update OpenSSL to 1.0.1h + * Update NoScript to 2.6.8.28 + * Update Tor to 0.2.4.22 + * Update Tor Launcher to 0.2.5.5 + * Bug 10425: Provide geoip6 file location to Tor process + * Bug 11754: Remove untranslated locales that were dropped from Transifex + * Bug 11772: Set Proxy Type menu correctly after restart + * Bug 11699: Change &#160 to   in UI elements + * Update Torbutton to 1.6.10.0 + * Bug 11510: about:tor should not report success if tor proxy is unreachable + * Bug 11783: Avoid b.webProgress error when double-clicking on New Identity + * Bug 11722: Add hidden pref to force remote Tor check + * Bug 11763: Fix pref dialog double-click race that caused settings to be reset + * Bug 11629: Support proxies with Pluggable Transports + * Updates FTEProxy to 0.2.15 + * Updates obfsproxy to 0.2.9 + * Backported Tor Patches: + * Bug 11654: Fix malformed log message in bug11156 patch. + * Bug 10425: Add in Tor's geoip6 files to the bundle distribution + * Bugs 11834 and 11835: Include Pluggable Transport documentation + * Bug 9701: Prevent ClipBoardCache from writing to disk. + * Bug 12146: Make the CONNECT Host header the same as the Request-URI. + * Bug 12212: Disable deprecated webaudio API + * Bug 11253: Turn on TLS 1.1 and 1.2. + * Bug 11817: Don't send startup time information to Mozilla. + Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms * Update HTTPS-Everywhere to 3.5.1

1 0

[tor-browser-bundle/master] Update NoScript version.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 78fb6e10a6faa6fd1171b61dac24a5732faeaa28 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:24:42 2014 -0700 Update NoScript version. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index 6b72a2e..ae465d2 100755 --- a/gitian/versions +++ b/gitian/versions @@ -49,7 +49,7 @@ GO_VER=1.3 ## 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.22-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.33-fn+sm+fx.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 @@ -77,7 +77,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bump versions for Torbutton and Tor Launcher.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit fae9b3e817af7d5fad0fa151f5bbe3efe7ff88b3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:14:18 2014 -0700 Bump versions for Torbutton and Tor Launcher. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2d7273d..15a5d8b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,8 +8,8 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 TOR_TAG=tor-0.2.5.5-alpha -TORLAUNCHER_TAG=0.2.6.0 -TORBUTTON_TAG=1.6.11.0 +TORLAUNCHER_TAG=0.2.6.1 +TORBUTTON_TAG=1.6.11.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Update changelog for Torbutton and Tor Launcher.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit ac7c21aac2e598b996c6436f81c9e2c27a707c7f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:22:58 2014 -0700 Update changelog for Torbutton and Tor Launcher. --- Bundle-Data/Docs/ChangeLog.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 104a135..ae14c46 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -3,14 +3,20 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 9 2014 * Include the Meek Pluggable Transport (version 0.9) (Bug 10935) * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.5-alpha - * Update NoScript to 2.6.8.31 + * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 3.5.3 - * Update Torbutton to 1.6.11.0 + * Update Torbutton to 1.6.11.1 * Bug 12221: Remove obsolete Javascript components from the toggle era * Bug 10819: Bind new third party isolation pref to Torbutton security UI * Bug 9268: Fix some window resizing corner cases with DPI and taskbar size. - * Update Tor Launcher to 0.2.6.0 + * Bug 12680: Change Torbutton URL in about dialog. + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Update Tor Launcher to 0.2.6.1 + * Bug 11199: Improve behavior if tor exits + * Bug 12451: Add option to hide TBB's logo + * Bug 11193: Change "Tor Browser Bundle" to "Tor Browser" + * Bug 11471: Ensure text fits the initial configuration dialog * Bug 11641: Reorganize bundle directory structure to mimic Firefox * Bug 10819: Create a preference to enable/disable third party isolation * Linux:

1 0

[tor-launcher/master] Bump version for 0.2.6.1.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 5658245110cfda72f27c97e79eb6aae052bcf0a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 22:03:44 2014 -0700 Bump version for 0.2.6.1. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index f5d64fa..a1b5d98 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.6.0</em:version> + <em:version>0.2.6.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[torbutton/master] Update version and changelog for 1.6.11.1.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit be0db9403efcde130744e7edb3daa401542dcd44 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 21:58:08 2014 -0700 Update version and changelog for 1.6.11.1. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a1c1428..7f04c4d 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.11.1 + 24 Jul 2014 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. + 1.6.11.0 27 Jun 2014 * Bug 10819: Bind new third party isolation pref to Torbutton security UI diff --git a/src/install.rdf b/src/install.rdf index 5eb071a..6a3aded 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.11.0</em:version> + <em:version>1.6.11.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_12680'
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 8830630b30998dfcea4171e6ec1a32ed14c1ad5f Merge: 0fb285c d01eadd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jul 24 21:57:40 2014 -0700 Merge remote-tracking branch 'gk/bug_12680' src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[torbutton/master] Bug 12680: Change Torbutton URL in about dialog.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit d01eadd91760507041df3a01a64ba8626c78d483 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 23 09:38:28 2014 +0000 Bug 12680: Change Torbutton URL in about dialog. --- src/chrome/content/about.xul | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul index e5c9525..79c6946 100644 --- a/src/chrome/content/about.xul +++ b/src/chrome/content/about.xul @@ -20,7 +20,7 @@ value="&torbutton.button.label;" onmouseover="event.target.style.cursor='pointer'" onmouseout="event.target.style.cursor='default'" - onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/torbutton/')"/> + onclick="Components.classes['@mozilla.org/appshell/window-mediator;1'].getService(Components.interfaces.nsIWindowMediator).getMostRecentWindow('navigator:browser').open('https://www.torproject.org/docs/torbutton/')"/> <label style="text-align:center; font-size:18px; margin-top: 10px; margin-bottom:20px;">&torbutton.about.summary;</label> <groupbox>

1 0

[torbutton/master] Bug 11472: about:tor logo and text may overlap.
by mikeperry＠torproject.org 25 Jul '14

25 Jul '14

commit 0fb285c3ca6b2196406084a50b11c641f2b8406e Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 16 10:33:52 2014 -0400 Bug 11472: about:tor logo and text may overlap. This problem occurred in some non-English locales (e.g., de). We now reduce the font size of some elements if necessary. --- src/chrome/content/aboutTor/aboutTor.xhtml | 9 ++++-- src/chrome/content/torbutton.js | 43 ++++++++++++++++++++++++++++ src/chrome/skin/aboutTor.css | 2 ++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index b99bc7e..f8f829d 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -132,15 +132,20 @@ function insertPropertyStrings() <div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> - <div class="hideIfTorOff"> + <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <h1>&aboutTor.success.label;</h1> + <br/> <h2 id="success2">&aboutTor.success2.label;</h2> + <br/> <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> + <br/> <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> </div> - <div class="hideIfTorOn"> + <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> <h1>&aboutTor.failure.label;</h1> + <br/> <h2>&aboutTor.failure2.label;</h2> + <br/> <h3>&aboutTor.failure3prefix.label;<a href="mailto:&aboutTor.failure3Link;" >&aboutTor.failure3Link;</a>&aboutTor.failure3suffix.label;</h3> </div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3e7cf62..f682f05 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -875,12 +875,55 @@ function torbutton_update_abouttor_doc(aDoc, aTorOn, aUpdateNeeded) { e.appendChild(aDoc.createTextNode(productName + '\n' + tbbVersion)); } catch (e) {} + let containerName = "torstatus-" + (aTorOn ? "on" : "off") + "-container"; + torbutton_adjust_abouttor_fontsizes(aDoc, containerName); torbutton_update_abouttor_arrow(aDoc); } return isAboutTor; } +// Ensure that text in top area does not overlap the tor on/off (onion) image. +// This is done by reducing the font sizes as necessary. +function torbutton_adjust_abouttor_fontsizes(aDoc, aContainerName) +{ + let imgElem = aDoc.getElementById("torstatus-image"); + let containerElem = aDoc.getElementById(aContainerName); + if (!imgElem || !containerElem) + return; + + try + { + let imgRect = imgElem.getBoundingClientRect(); + + for (let textElem = containerElem.firstChild; textElem; + textElem = textElem.nextSibling) + { + if ((textElem.nodeType != textElem.ELEMENT_NODE) || + (textElem.nodeName.toLowerCase() == "br")) + { + continue; + } + + let textRect = textElem.getBoundingClientRect(); + if (0 == textRect.width) + continue; + + // Reduce font to 90% of previous size, repeating the process up to 7 + // times. This allows for a maximum reduction to just less than 50% of + // the original size. + let maxTries = 7; + while ((textRect.left < imgRect.right) && (--maxTries >= 0)) + { + let style = aDoc.defaultView.getComputedStyle(textElem, null); + let fontSize = parseFloat(style.getPropertyValue("font-size")); + textElem.style.fontSize = (fontSize * 0.9) + "px"; + textRect = textElem.getBoundingClientRect(); + } + } + } catch (e) {} +} + // Determine X position of torbutton toolbar item and pass it through // to the xhtml document. function torbutton_update_abouttor_arrow(aDoc) { diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 192e345..0c12374 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -135,6 +135,8 @@ body .top div.hideIfTorIsUpToDate h1.hideIfTorOff { margin-left: 30px; } +/* Use inline-block for text-oriented elements whose widths need to measured. */ +.torstatus-container *, .top div.hideIfTorIsUpToDate h3 { display: inline-block; }

1 0