- tbb-commits - lists.torproject.org

[torbutton/master] Update translations for 1.6.12.0.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit b6e98c0513a931ef330d1d4a818beb14b829e7b3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:40:41 2014 -0700 Update translations for 1.6.12.0. --- src/chrome/locale/de/torbutton.dtd | 24 ++++++++++++------------ src/chrome/locale/es/torbutton.dtd | 6 +++--- src/chrome/locale/pt/aboutTor.dtd | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd index 9b90090..6242e22 100644 --- a/src/chrome/locale/de/torbutton.dtd +++ b/src/chrome/locale/de/torbutton.dtd @@ -27,21 +27,21 @@ <!ENTITY torbutton.context_menu.toggle "Tor-Modus umschalten"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Einstellungen …"> -<!ENTITY torbutton.context_menu.preferences.key "P"> +<!ENTITY torbutton.context_menu.preferences.key "E"> <!ENTITY torbutton.context_menu.about "Über Torbutton …"> -<!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Öffne Netzwerkeinstellungen …"> -<!ENTITY torbutton.context_menu.networksettings.key "S"> +<!ENTITY torbutton.context_menu.about.key "Ü"> +<!ENTITY torbutton.context_menu.networksettings "Netzwerkeinstellungen öffnen …"> +<!ENTITY torbutton.context_menu.networksettings.key "N"> <!ENTITY torbutton.context_menu.downloadUpdate "Aktualisierung des Tor-Browser-Paket herunterladen …"> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Schutzvorkehrungen"> +<!ENTITY torbutton.context_menu.downloadUpdate.key "A"> +<!ENTITY torbutton.context_menu.cookieProtections "Cookie-Schutzvorkehrungen"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.context_menu.copyTor "Tor-URL kopieren"> -<!ENTITY torbutton.context_menu.copyTor.key "p"> -<!ENTITY torbutton.context_menu.openTorTab "Tor-URL in neuem Tab öffnen"> -<!ENTITY torbutton.context_menu.openTorTab.key "r"> -<!ENTITY torbutton.context_menu.openTorWindow "Tor-URL in neuem Fenster öffnen"> -<!ENTITY torbutton.context_menu.openTorWindow.key "d"> +<!ENTITY torbutton.context_menu.copyTor "Tor-Adresse kopieren"> +<!ENTITY torbutton.context_menu.copyTor.key "k"> +<!ENTITY torbutton.context_menu.openTorTab "Tor-Adresse in neuem Reiter öffnen"> +<!ENTITY torbutton.context_menu.openTorTab.key "F"> +<!ENTITY torbutton.context_menu.openTorWindow "Tor-Adresse in neuem Fenster öffnen"> +<!ENTITY torbutton.context_menu.openTorWindow.key "F"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klicken, um Torbutton zu aktivieren"> <!ENTITY torbutton.prefs.sec_settings "Sicherheitseinstellungen"> diff --git a/src/chrome/locale/es/torbutton.dtd b/src/chrome/locale/es/torbutton.dtd index 43aa7cd..c60b592 100644 --- a/src/chrome/locale/es/torbutton.dtd +++ b/src/chrome/locale/es/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "Acerca de Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Abrir Preferencias de Red..."> +<!ENTITY torbutton.context_menu.networksettings "Abrir configuración de red…"> <!ENTITY torbutton.context_menu.networksettings.key "G"> <!ENTITY torbutton.context_menu.downloadUpdate "Descargar actualización del Paquete de Navegador Tor"> <!ENTITY torbutton.context_menu.downloadUpdate.key "a"> @@ -145,6 +145,6 @@ <!ENTITY torbutton.prefs.fix_google_srch "Despojar de información de su plataforma e idioma a las consultas en los cuadros de busqueda de Google"> <!ENTITY torbutton.prefs.transparentTor "Torificación transparente (requiere un transproxy personalizado o un router Tor)"> <!ENTITY torbutton.prefs.block_disk "No registrar historial de navegación o datos del sitio web (habilita Modo de Navegación Privada)"> -<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceras partes y otros datos de seguimiento"> -<!ENTITY torbutton.prefs.block_plugins "Deshabilitar plugins del navegador (tales como Flash)"> +<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir cookies de terceros y otros datos de seguimiento"> +<!ENTITY torbutton.prefs.block_plugins "Desactivar complementos del navegador (como Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambiar los detalles que le distinguen de otros usuarios de Navegador Tor"> diff --git a/src/chrome/locale/pt/aboutTor.dtd b/src/chrome/locale/pt/aboutTor.dtd index 05e9d84..dbff853 100644 --- a/src/chrome/locale/pt/aboutTor.dtd +++ b/src/chrome/locale/pt/aboutTor.dtd @@ -4,16 +4,16 @@ - vim: set sw=2 sts=2 ts=8 et syntax=xml: --> -<!ENTITY aboutTor.title "Acerca do Tor"> +<!ENTITY aboutTor.title "Sobre o Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALÉM DISSO, o seu navegador está desatualizado."> +<!ENTITY aboutTor.outOfDateTorOn.label "CONTUDO, este navegador está desatualizado."> +<!ENTITY aboutTor.outOfDateTorOff.label "TAMBÉM, este navegador está desatualizado."> <!ENTITY aboutTor.outOfDate2.label "Clique no símbolo da cebola e escolha Download Tor Browser Bundle Update."> -<!ENTITY aboutTor.check.label "Teste as definições da rede Tor"> +<!ENTITY aboutTor.check.label "Testar as Definições da Rede Tor"> <!ENTITY aboutTor.success.label "Parabéns!"> -<!ENTITY aboutTor.success2.label "O seu navegador está configurado para usar o Tor."> +<!ENTITY aboutTor.success2.label "Este navegador está configurado para utilizar o Tor."> <!ENTITY aboutTor.success3.label "Agora já pode navegar a Internet de forma anónima."> <!ENTITY aboutTor.failure.label "Algo Correu Mal!"> <!ENTITY aboutTor.failure2.label "O Tor não está a funcionar neste navegador.">

1 0

[torbutton/master] Update changelog for 1.6.12.0.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit ff97c029c4ae47e278c3304c178cd92cfa142415 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:32:52 2014 -0700 Update changelog for 1.6.12.0. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 7f04c4d..5b35a6a 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.6.12.0 + 4 Aug 2014 + * Bug 9531: Workaround to avoid rare hangs during New Identity + 1.6.11.1 24 Jul 2014 * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap diff --git a/src/install.rdf b/src/install.rdf index 6a3aded..f8c0f97 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.1</em:version> + <em:version>1.6.12.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

[torbutton/master] Bug 9535: Fix hang on New Identity.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit e4c902b03302f99ce69c3f148573aa89122d169f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 27 15:56:43 2014 +0000 Bug 9535: Fix hang on New Identity. The related bug 10804 needs a different fix as this one applied there would stall the start-up for a short amount of time resulting in a bad user experience. --- src/chrome/content/torbutton.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f682f05..4cd9c3d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1634,7 +1634,7 @@ function torbutton_do_new_identity() { } torbutton_log(3, "New Identity: Clearing LocalStorage"); - + try { Components.utils.import("resource:///modules/offlineAppCache.jsm"); OfflineAppCacheHelper.clear(); @@ -1700,6 +1700,18 @@ function torbutton_do_new_identity() { getService(Ci.nsIPermissionManager); pm.removeAll(); + // We spin the event queue until it is empty and we can be sure that sending + // NEWNYM is not leading to a deadlock (see bug 9531 comment 23 for an + // invstigation on why and when this may happen). This is surrounded by + // suppressing/unsuppressing user initiated events in a window's document to + // be sure that these events are not interfering with processing events being + // in the event queue. + var thread = Cc["@mozilla.org/thread-manager;1"]. + getService(Ci.nsIThreadManager).currentThread; + m_tb_domWindowUtils.suppressEventHandling(true); + while (thread.processNextEvent(false)) {} + m_tb_domWindowUtils.suppressEventHandling(false); + torbutton_log(3, "New Identity: Sending NEWNYM"); // We only support TBB for newnym.

1 0

[tor-browser-bundle/maint-3.6] Fix changelog to say 3.6.4.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit 23bccdb1ca1003a326b3815019aa88722d59e386 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 19:24:20 2014 -0700 Fix changelog to say 3.6.4. Also update Torbutton version to pick up some UI tweaks. --- Bundle-Data/Docs/ChangeLog.txt | 5 ++++- gitian/versions | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ecd891..d2468be 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,8 +1,11 @@ -Tor Browser Bundle 3.6.3 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 * Bug 9516: Send Tor Launcher log messages to Browser Console + * Update Torbutton to 1.6.11.1 + * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap + * Bug 12680: Fix Torbutton about url. Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms diff --git a/gitian/versions b/gitian/versions index 10690ce..e5e53e4 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.23 TORLAUNCHER_TAG=0.2.5.6 -TORBUTTON_TAG=1.6.11.0 +TORBUTTON_TAG=1.6.11.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/maint-3.6] Add Changelog fo 3.6.4.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit a37f1c0cf686c2ad3cdbe715c6b242a0d2cfb9ac Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 18:34:49 2014 -0700 Add Changelog fo 3.6.4. Also bump Tor Launcher version to pick up #9516. --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ gitian/versions | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 1e12190..7ecd891 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser Bundle 3.6.3 -- Aug 6 2014 + * All Platforms + * Update Tor to 0.2.4.23 + * Update Tor launcher to 0.2.5.6 + * Bug 9516: Send Tor Launcher log messages to Browser Console + Tor Browser Bundle 3.6.3 -- Jul 24 2014 * All Platforms * Update Firefox to 24.7.0esr diff --git a/gitian/versions b/gitian/versions index 38eae32..10690ce 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.4pre +TORBROWSER_VERSION=3.6.4 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -8,7 +8,7 @@ FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.23 -TORLAUNCHER_TAG=0.2.5.5 +TORLAUNCHER_TAG=0.2.5.6 TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1

1 0

[tor-launcher/maint-0.2.5] Bump version to 0.2.5.6.
by mikeperry＠torproject.org 05 Aug '14

05 Aug '14

commit e058a548e736c75982873614631c1f4cb37b04a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Aug 4 18:22:36 2014 -0700 Bump version to 0.2.5.6. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 702745d..bd64022 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.5</em:version> + <em:version>0.2.5.6</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-browser-bundle/master] Bug 12753: Zeroing timestamps in PE headers.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit ad5ea06183c12e8ae18274a72cb5bbc353180400 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 4 14:26:34 2014 +0000 Bug 12753: Zeroing timestamps in PE headers. Switching to a new toolchain for Windows (using Binutils 2.24 and GCC 4.8.3) led to new problems producing Windows bundles in a reliable fashion. Thanks to a patch by a cypherpunk we avoid differences in PE header timestamps as one possible source for the issues mentioned in bug 12753. --- gitian/descriptors/windows/gitian-utils.yml | 3 +++ gitian/patches/peXXigen.patch | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 87a0bce..87dbe16 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -31,6 +31,7 @@ files: - "gcc.tar.bz2" - "openssl.tar.gz" - "gmp.tar.bz2" +- "peXXigen.patch" - "versions" - "dzip.sh" script: | @@ -45,6 +46,8 @@ script: | cd binutils* # XXX: This is needed due to bug 10102. sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c + # Zeroing timestamps in PE headers reliably, see bug 12753. + patch -p1 < ../peXXigen.patch ./configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib make $MAKEOPTS make install diff --git a/gitian/patches/peXXigen.patch b/gitian/patches/peXXigen.patch new file mode 100644 index 0000000..785aa02 --- /dev/null +++ b/gitian/patches/peXXigen.patch @@ -0,0 +1,14 @@ +diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c +*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 +--- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 +*************** +*** 795,800 **** +--- 795,802 ---- + /* Only use a real timestamp if the option was chosen. */ + if ((pe_data (abfd)->insert_timestamp)) + H_PUT_32 (abfd, time(0), filehdr_out->f_timdat); ++ else ++ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr);

1 0

[tor-browser-bundle/master] Set a blackhole proxy in the meek-http-helper profile.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit 92e501a980295a06c2eb94bf03370b66ef8e5563 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 27 09:53:07 2014 -0700 Set a blackhole proxy in the meek-http-helper profile. https://trac.torproject.org/projects/tor/ticket/12674 The extension manually overrides the proxy setting for every request, so this doesn't affect the functioning of the extension. It's intended as a failsafe to prevent network interaction in case something goes wrong and the user manages to disable the extension and open the profile with a normal browser window. In order to cause that to happen, I had to do: ./Browser/firefox -safe-mode -profile Data/Browser/profile.meek-http-helper/ Prior to this commit, running the above command would have given you an ordinary unproxied Firefox. Now you will get "The proxy server is refusing connections." --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index a95a6ec..cddc237 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,13 +4,6 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); -// 0 is "No proxy". -user_pref("network.proxy.type", 0); - -// Allow unproxied DNS. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:6 -user_pref("network.proxy.socks_remote_dns", false); - // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9 @@ -21,4 +14,17 @@ user_pref("security.enable_tls_session_tickets", true); // https://support.mozilla.org/en-US/questions/951221#answer-410562 user_pref("toolkit.startup.max_resumed_crashes", -1); +// Set a failsafe blackhole proxy of 127.0.0.1:9, to prevent network interaction +// in case the user manages to open this profile with a normal browser UI (i.e., +// not headless with the meek-http-helper extension running). Port 9 is +// "discard", so it should work as a blackhole whether the port is open or +// closed. network.proxy.type=1 means "Manual proxy configuration". +// http://kb.mozillazine.org/Network.proxy.type +user_pref("network.proxy.type", 1); +user_pref("network.proxy.socks", "127.0.0.1"); +user_pref("network.proxy.socks_port", 9); +// Make sure DNS is also blackholed. network.proxy.socks_remote_dns is +// overridden by meek-http-helper at startup. +user_pref("network.proxy.socks_remote_dns", true); + user_pref("extensions.enabledAddons", "meek-http-helper@bamsoftware.com:1.0");

1 0

[tor-browser-bundle/master] Use meek 0.10.
by gk＠torproject.org 04 Aug '14

04 Aug '14

commit 69b9ca1b186a575debf823de760a0a048da03819 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Aug 2 00:57:37 2014 -0700 Use meek 0.10. 0.10 has the patch to set network.proxy.socks_remote_dns=false within the Firefox extension, so it doesn't have to be set in user.js. --- 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 ae465d2..20c7e73 100755 --- a/gitian/versions +++ b/gitian/versions @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d28bbdc..8f558d7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 diff --git a/gitian/versions.beta b/gitian/versions.beta index 16692b2..dbb50d8 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -23,7 +23,7 @@ FTEPROXY_TAG=d1186cc366895701a1cae5fc39afbe2534dad600 # tag 0.2.17 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.9 +MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[tor-launcher/maint-0.2.5] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 01 Aug '14

01 Aug '14

commit 40751d8580192902227a447ee89d8018a34800c9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index bcff6ab..0e78736 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -497,6 +503,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1275,6 +1282,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[tor-launcher/master] Bug 9516: Show Tor log in TorBrowser
by brade＠torproject.org 31 Jul '14

31 Jul '14

commit 423552fe7009ebe8bd61f92ca525018c124a1b56 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 31 14:18:56 2014 -0400 Bug 9516: Show Tor log in TorBrowser Provide a stopgap solution: route all tor messages captured by Tor Launcher to the Browser Console. --- src/components/tl-protocol.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 85a0165..9c4d957 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -25,6 +25,12 @@ function TorProtocolService() try { + this.mConsoleSvc = Cc["@mozilla.org/consoleservice;1"] + .getService(Ci.nsIConsoleService); + } catch (e) {} + + try + { var env = Cc["@mozilla.org/process/environment;1"] .getService(Ci.nsIEnvironment); @@ -496,6 +502,7 @@ TorProtocolService.prototype = // Private Member Variables //////////////////////////////////////////////// + mConsoleSvc: null, mControlPort: null, mControlHost: null, mControlPassword: null, // JS string that contains hex-encoded password. @@ -1295,6 +1302,15 @@ TorProtocolService.prototype = this.mTorLog.splice(0, 1); } this.mTorLog.push(logObj); + + // We could use console.info(), console.error(), and console.warn() + // but when those functions are used the console output includes + // extraneous double quotes. See Mozilla bug # 977586. + if (this.mConsoleSvc) + { + let s = "Tor " + logObj.type + ": " + logObj.msg; + this.mConsoleSvc.logStringMessage(s); + } break; case "STATUS_CLIENT": this._parseBootstrapStatus(msg);

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere version to the 5.0-alpha series.
by mikeperry＠torproject.org 30 Jul '14

30 Jul '14

commit a6ec17d500fadaa6ce9259ac5a7bd8150504e2a4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Jul 29 18:41:37 2014 -0700 Bump HTTPS-Everywhere version to the 5.0-alpha series. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 54875ad..4b4a1a2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014 * Update Tor to 0.2.5.6-alpha * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar - * Update HTTPS Everywhere to 3.5.3 + * Update HTTPS Everywhere to 5.0development.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 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 34c4409..d28bbdc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0development.17 +HTTPSE_VER=5.0development.0 GO_VER=1.3 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=eac48781de747a33503c92a36024d910af97fa3264c3912faff282d99da092fb +HTTPSE_HASH=6feb4982d13f89656b61435b6b49e1996c61bc79e52d046d02312879376028e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/master] Bump HTTPS-Everywhere to 4.0 for the TBB alpha.
by mikeperry＠torproject.org 29 Jul '14

29 Jul '14

commit 7c9c5f63ebc127b651c5bbc146be8d07cf12c961 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 19:26:55 2014 -0700 Bump HTTPS-Everywhere to 4.0 for the TBB alpha. --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 69363a3..34c4409 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -43,7 +43,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.3 +HTTPSE_VER=4.0development.17 GO_VER=1.3 ## File names for the source packages @@ -78,7 +78,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=b2ea02e9ecf05d174a6d5b4cf1ee13d63cdad1c016160f3836aeeaa96790b189 -HTTPSE_HASH=06a635a6a9dd2a31f4ab72c9ed8bf612bdda33941f5fe8b3225553fdc3b99e10 +HTTPSE_HASH=eac48781de747a33503c92a36024d910af97fa3264c3912faff282d99da092fb MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/maint-3.6] Bump Tor stable version.
by mikeperry＠torproject.org 29 Jul '14

29 Jul '14

commit efd8722961016b4c10f0bdd9c7fca5f0f58bf23a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 17:45:10 2014 -0700 Bump Tor stable version. --- gitian/versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions b/gitian/versions index c7348b7..38eae32 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.3 +TORBROWSER_VERSION=3.6.4pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -7,7 +7,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 -TOR_TAG=tor-0.2.4.22 +TOR_TAG=tor-0.2.4.23 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.11.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630

1 0

[tor-browser-bundle/master] Bump Tor version and update changelog for 4.0-alpha-1.
by mikeperry＠torproject.org 28 Jul '14

28 Jul '14

commit ee84742da7aff980dca12fb410455a3a38f08bb2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jul 28 14:04:20 2014 -0700 Bump Tor version and update changelog for 4.0-alpha-1. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ef2dd84..54875ad 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,7 +2,7 @@ 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 - * Update Tor to 0.2.5.5-alpha + * Update Tor to 0.2.5.6-alpha * Update NoScript to 2.6.8.33 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 3.5.3 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 15a5d8b..69363a3 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -7,7 +7,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.7.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1 -TOR_TAG=tor-0.2.5.5-alpha +TOR_TAG=tor-0.2.5.6-alpha 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

1 0

[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] 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-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-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