- tbb-commits - lists.torproject.org

[tor-launcher/maint-0.2.14] Release preparations for 0.2.14.4
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit f7f60947ca566f2e57a143626d7e36b9422eab8b Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 12:55:46 2018 +0000 Release preparations for 0.2.14.4 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 382966c..1604ac6 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.14.3</em:version> + <em:version>0.2.14.4</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[torbutton/maint-1.9.8] Release preparations for 1.9.8.6
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 854b9e572015315e2896ed697996d514923c4472 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 12:36:46 2018 +0000 Release preparations for 1.9.8.6 CHANGELOG update and version bump --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 79ce7a0..b3dadd1 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.8.6 + * Bug 24159: Version check does not deal with platform specific checks + * Bug 25016: Remove 2017 donation banner + * Translations update + 1.9.8.5 * Bug 21245: Add da translation to Torbutton and keep track of it * Bug 24702: Remove Mozilla text from banner diff --git a/src/install.rdf b/src/install.rdf index 73e9055..de34890 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.9.8.5</em:version> + <em:version>1.9.8.6</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[torbutton/maint-1.9.8] Translations update
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 8c29b6b2e6512a90842ea41b22bd58d100a99f1e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 12:34:10 2018 +0000 Translations update --- src/chrome/locale/es/aboutDialog.dtd | 2 +- src/chrome/locale/es/aboutTBUpdate.dtd | 2 +- src/chrome/locale/es/aboutTor.dtd | 2 +- src/chrome/locale/ja/aboutTor.properties | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chrome/locale/es/aboutDialog.dtd b/src/chrome/locale/es/aboutDialog.dtd index 537b767..55a6b36 100644 --- a/src/chrome/locale/es/aboutDialog.dtd +++ b/src/chrome/locale/es/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; está desarrollado por">  <!ENTITY project.tpoLink "el/la &vendorShortName;"> -<!ENTITY project.end ", una organización sin ánimo de lucro que trabaja para defender su privacidad y libertad en línea."> +<!ENTITY project.end ", una organización sin ánimo de lucro que trabaja para defender tu privacidad y libertad en línea."> <!ENTITY help.start "¿Quieres ayudar?">  diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es/aboutTBUpdate.dtd index 6fe0c42..d515a5e 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Actualización del Navegador Tor"> <!ENTITY aboutTBUpdate.updated "El Navegador Tor ha sido actualizado."> -<!ENTITY aboutTBUpdate.linkPrefix "Para ver la información mas actualizada de esta versión, "> +<!ENTITY aboutTBUpdate.linkPrefix "Para ver la información más actualizada de esta versión, "> <!ENTITY aboutTBUpdate.linkLabel "visite nuestro sitio web"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Registro de cambios:"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 47bc216..35be7ee 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -35,7 +35,7 @@ <!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte."> <!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Ofrece sus servicios como voluntario »"> +<!ENTITY aboutTor.helpInfo4.label "Ofrece tus serviciosde forma voluntaria »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.helpInfo5.label "Realiza una donación »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 6fdf984..848d0dc 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=今すぐ寄付願います！ aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline3=フリーダムオンライン aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。

1 0

[torbutton/master] Translations update
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 10606f2c5f13ad85f66fba4ba6edf99252a2ffb8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 12:34:10 2018 +0000 Translations update --- src/chrome/locale/es/aboutDialog.dtd | 2 +- src/chrome/locale/es/aboutTBUpdate.dtd | 2 +- src/chrome/locale/es/aboutTor.dtd | 2 +- src/chrome/locale/ja/aboutTor.properties | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/chrome/locale/es/aboutDialog.dtd b/src/chrome/locale/es/aboutDialog.dtd index 537b767..55a6b36 100644 --- a/src/chrome/locale/es/aboutDialog.dtd +++ b/src/chrome/locale/es/aboutDialog.dtd @@ -1,7 +1,7 @@ <!ENTITY project.start "&brandShortName; está desarrollado por">  <!ENTITY project.tpoLink "el/la &vendorShortName;"> -<!ENTITY project.end ", una organización sin ánimo de lucro que trabaja para defender su privacidad y libertad en línea."> +<!ENTITY project.end ", una organización sin ánimo de lucro que trabaja para defender tu privacidad y libertad en línea."> <!ENTITY help.start "¿Quieres ayudar?">  diff --git a/src/chrome/locale/es/aboutTBUpdate.dtd b/src/chrome/locale/es/aboutTBUpdate.dtd index 6fe0c42..d515a5e 100644 --- a/src/chrome/locale/es/aboutTBUpdate.dtd +++ b/src/chrome/locale/es/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ <!ENTITY aboutTBUpdate.title "Actualización del Navegador Tor"> <!ENTITY aboutTBUpdate.updated "El Navegador Tor ha sido actualizado."> -<!ENTITY aboutTBUpdate.linkPrefix "Para ver la información mas actualizada de esta versión, "> +<!ENTITY aboutTBUpdate.linkPrefix "Para ver la información más actualizada de esta versión, "> <!ENTITY aboutTBUpdate.linkLabel "visite nuestro sitio web"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Registro de cambios:"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 47bc216..35be7ee 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -35,7 +35,7 @@ <!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte."> <!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Ofrece sus servicios como voluntario »"> +<!ENTITY aboutTor.helpInfo4.label "Ofrece tus serviciosde forma voluntaria »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.helpInfo5.label "Realiza una donación »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 6fdf984..848d0dc 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=今すぐ寄付願います！ aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline3=フリーダムオンライン aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=数百万件以上のプライバシーを毎日保護しています。

1 0

[tor-browser-build/maint-7.5] Bump rbm (picking up fix for #25422)
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 2d967ad67088cacbab8e91686bf3d8b7c2aae50c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 6 12:27:21 2018 +0000 Bump rbm (picking up fix for #25422) --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 7494edc..b4c8c38 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b +Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8

1 0

[tor-browser-build/maint-7.5] Bump rbm (picking up fix for #25435)
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 10b6ffd8b1168797a24934ae28944faf60d327c9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 07:34:06 2018 +0000 Bump rbm (picking up fix for #25435) --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index b4c8c38..db41d8e 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8 +Subproject commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b

1 0

[tor-browser-build/master] Bump rbm (picking up fix for #25435)
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit 058b6520125e57161753d3357fcab6ecd67496bf Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 7 07:34:06 2018 +0000 Bump rbm (picking up fix for #25435) --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index b4c8c38..db41d8e 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8 +Subproject commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b

1 0

[rbm/master] Bug 25435: use --no-auto-check-trustdb to avoid modifying gpg keyring files
by gk＠torproject.org 07 Mar '18

07 Mar '18

commit db41d8e754ed8cd6cee7bca18d76d59f8f7f369b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Mar 6 21:27:39 2018 +0100 Bug 25435: use --no-auto-check-trustdb to avoid modifying gpg keyring files By default gpg will from time to time update its trust database. When this happens it will also modify the keyring files to add some trust information. To avoid this we add the --no-auto-check-trustdb option. As we don't use the Web of Trust when we use a keyring file, we also disable it using `--trust-model always`. --- lib/RBM/DefaultConfig.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/RBM/DefaultConfig.pm b/lib/RBM/DefaultConfig.pm index 4121264..d758b8e 100644 --- a/lib/RBM/DefaultConfig.pm +++ b/lib/RBM/DefaultConfig.pm @@ -216,7 +216,8 @@ OPT_END export LC_ALL=C [% IF c('gpg_keyring'); - SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) _ ' --no-default-keyring'; + SET gpg_kr = '--keyring ' _ path(c('gpg_keyring'), path(c('gpg_keyring_dir'))) + _ ' --no-default-keyring --no-auto-check-trustdb --trust-model always'; END; -%] exec [% c('gpg_bin') %] [% c('gpg_args') %] --with-fingerprint [% gpg_kr %] "\$@"

1 0

[tor-browser-build/master] Bump rbm (picking up fix for #25422)
by gk＠torproject.org 06 Mar '18

06 Mar '18

commit 5ab5b08179208d0fc4f38dd76686bf1df65a7389 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 6 12:27:21 2018 +0000 Bump rbm (picking up fix for #25422) --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 7494edc..b4c8c38 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 7494edc6d2556c511c213823a6549410ba75f73b +Subproject commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8

1 0

[rbm/master] Bug 25422: Give more details in "Cannot checkout" errors
by gk＠torproject.org 06 Mar '18

06 Mar '18

commit b4c8c38e12d11eb232305949c5d42d5df5e8f5c8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Mar 5 14:47:03 2018 +0100 Bug 25422: Give more details in "Cannot checkout" errors Print stderr from the git/hg command if the checkout failed. --- lib/RBM.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 3b19ca9..f987130 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -472,7 +472,7 @@ sub execute { git_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $git_hash); - exit_error "Cannot checkout $git_hash" unless $success; + exit_error "Cannot checkout $git_hash:\n$stderr" unless $success; if (project_config($project, 'git_submodule', $options)) { ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'submodule', 'update', '--init'); @@ -485,7 +485,7 @@ sub execute { hg_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) = capture_exec('hg', 'update', '-C', $hg_hash); - exit_error "Cannot checkout $hg_hash" unless $success; + exit_error "Cannot checkout $hg_hash:\n$stderr" unless $success; } my ($stdout, $stderr, $success, $exit_code) = run_script($project, $cmd, \&capture_exec);

1 0