- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27125 - Move localized Tor Browser for Android strings into separate file
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 970fcfe56478aa18fdeaf9ec902f016165dade62 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Nov 19 20:56:22 2018 +0000 Bug 27125 - Move localized Tor Browser for Android strings into separate file Revert changed localized string we don't use anymore. --- .../android/base/locales/en-US/android_strings.dtd | 29 ++-------------------- .../base/locales/en-US/torbrowser_strings.dtd | 25 +++++++++++++++++++ mobile/android/base/locales/moz.build | 1 + mobile/android/base/strings.xml.in | 1 + .../mozbuild/action/generate_strings_xml.py | 3 ++- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index d7cded48fda4..bd55ce0a832f 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -4,8 +4,9 @@ <!ENTITY firstrun_panel_title_welcome "Welcome"> <!ENTITY firstrun_urlbar_message2 "Thanks for choosing &brandShortName;"> -<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from The Tor Project, the non-profit committed to a free and open web."> +<!ENTITY firstrun_urlbar_subtext2 "A modern mobile browser from Mozilla, the non-profit committed to a free and open web."> <!ENTITY firstrun_panel_title_privacy "Privacy"> +  <!ENTITY firstrun_privacy_subtext "Private Browsing with Tracking Protection blocks trackers while you browse and won’t remember your history when you finish browsing."> <!ENTITY firstrun_panel_title_customize "Customize"> @@ -43,32 +44,6 @@ <!ENTITY firstrun_account_title "You"> <!ENTITY firstrun_account_message "Have &brandShortName; on another device?"> - -<!ENTITY firstrun_welcome_tab_title "Welcome"> -<!ENTITY firstrun_welcome_title "You\'re ready."> -<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> -<!ENTITY firstrun_welcome_next "Start now"> -<!ENTITY firstrun_privacy_tab_title "Privacy"> -<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> -<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> -<!ENTITY firstrun_privacy_next "Go to Tor Network"> -<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> -<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> -<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> -<!ENTITY firstrun_tornetwork_next "Next"> -<!ENTITY firstrun_secsettings_tab_title "Security"> -<!ENTITY firstrun_secsettings_title "Choose your experience."> -<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> -<!ENTITY firstrun_secsettings_next "Next"> -<!ENTITY firstrun_tips_tab_title "Tips"> -<!ENTITY firstrun_tips_title "Experience Tips."> -<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> -<!ENTITY firstrun_tips_next "Next"> -<!ENTITY firstrun_onionservices_tab_title "Onions"> -<!ENTITY firstrun_onionservices_title "Onion Services."> -<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> -<!ENTITY firstrun_onionservices_next "Go to explore"> - <!ENTITY onboard_start_restricted1 "Stay safe and in control with this simplified version of &brandShortName;.">  +<!ENTITY firstrun_welcome_tab_title "Welcome"> +<!ENTITY firstrun_welcome_title "You\'re ready."> +<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how."> +<!ENTITY firstrun_welcome_next "Start now"> +<!ENTITY firstrun_privacy_tab_title "Privacy"> +<!ENTITY firstrun_privacy_title "Snub trackers and snoopers."> +<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level."> +<!ENTITY firstrun_privacy_next "Go to Tor Network"> +<!ENTITY firstrun_tornetwork_tab_title "Tor Network"> +<!ENTITY firstrun_tornetwork_title "Travel a decentralized network."> +<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately."> +<!ENTITY firstrun_tornetwork_next "Next"> +<!ENTITY firstrun_secsettings_tab_title "Security"> +<!ENTITY firstrun_secsettings_title "Choose your experience."> +<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer."> +<!ENTITY firstrun_secsettings_next "Next"> +<!ENTITY firstrun_tips_tab_title "Tips"> +<!ENTITY firstrun_tips_title "Experience Tips."> +<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot."> +<!ENTITY firstrun_tips_next "Next"> +<!ENTITY firstrun_onionservices_tab_title "Onions"> +<!ENTITY firstrun_onionservices_title "Onion Services."> +<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously."> +<!ENTITY firstrun_onionservices_next "Go to explore"> diff --git a/mobile/android/base/locales/moz.build b/mobile/android/base/locales/moz.build index 81edbea9425b..d863a3cc5680 100644 --- a/mobile/android/base/locales/moz.build +++ b/mobile/android/base/locales/moz.build @@ -65,4 +65,5 @@ for f in ['../res/values/strings.xml', # The `en-US/` will be rewritten to the locale-specific path. 'en-US/android_strings.dtd', 'en-US/sync_strings.dtd', + 'en-US/torbrowser_strings.dtd', ] diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index cfc7b5a137f8..2beb152ad5bb 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -8,6 +8,7 @@ #includesubst @BRANDPATH@ #includesubst @STRINGSPATH@ #includesubst @SYNCSTRINGSPATH@ +#includesubst @TBSTRINGSPATH@  <!ENTITY formatI "%I"> diff --git a/python/mozbuild/mozbuild/action/generate_strings_xml.py b/python/mozbuild/mozbuild/action/generate_strings_xml.py index b60b480f0748..0b3ca6efb229 100644 --- a/python/mozbuild/mozbuild/action/generate_strings_xml.py +++ b/python/mozbuild/mozbuild/action/generate_strings_xml.py @@ -11,7 +11,7 @@ import buildconfig from mozbuild import preprocessor -def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None): +def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, torbrowser_strings_dtd, locale=None): if not locale: raise ValueError('locale must be specified!') @@ -23,6 +23,7 @@ def main(output, strings_xml, android_strings_dtd, sync_strings_dtd, locale=None # Includes. defines['STRINGSPATH'] = android_strings_dtd defines['SYNCSTRINGSPATH'] = sync_strings_dtd + defines['TBSTRINGSPATH'] = torbrowser_strings_dtd # Fennec branding is en-US only: see # $(MOZ_BRANDING_DIRECTORY)/locales/jar.mn. defines['BRANDPATH'] = '{}/{}/locales/en-US/brand.dtd'.format(

1 0

[tor-browser-build/master] Bug 26843: add projects/firefox-locale-bundle
by gk＠torproject.org 22 Nov '18

22 Nov '18

commit 43c9452946313a5ab3dd064501daa05096db86eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Nov 19 13:04:54 2018 +0100 Bug 26843: add projects/firefox-locale-bundle projects/firefox-locale-bundle will clone or pull the mercurial repositories for each locale into the hg_clones/firefox-locale-bundle directory, and generate tarballs using the changesets listed in the firefox json file. The script get_hg_hash is used to parse this json file and output the hg changeset for the selected locale. Patch based on work started by GeKo. --- README | 9 ++++++--- projects/firefox-locale-bundle/build | 29 +++++++++++++++++++++++++++++ projects/firefox-locale-bundle/config | 12 ++++++++++++ projects/firefox-locale-bundle/get_hg_hash | 21 +++++++++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/README b/README index a20b659..8ebef9b 100644 --- a/README +++ b/README @@ -14,8 +14,10 @@ to extract container file systems, start containers and copy files to and from containers. The sources of most components are downloaded using git, which needs to -be installed. The sources of webrtc are downloaded using gclient, which -requires GTK+ 2.0 development files and curl to be installed. +be installed. Some components are downloaded using mercurial which also +needs to be installed. The sources of webrtc are downloaded using +gclient, which requires GTK+ 2.0 development files and curl to be +installed. You also need a few perl modules installed: - YAML::XS @@ -41,7 +43,8 @@ If you are running Debian or Ubuntu, you can install them with: libio-captureoutput-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - libfile-copy-recursive-perl git libgtk2.0-dev curl runc + libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ + mercurial The build system is based on rbm, which is included as a git submodule in the rbm/ directory. You can fetch the rbm git submodule by running diff --git a/projects/firefox-locale-bundle/build b/projects/firefox-locale-bundle/build new file mode 100644 index 0000000..3fec48e --- /dev/null +++ b/projects/firefox-locale-bundle/build @@ -0,0 +1,29 @@ +#!/bin/bash + +[% c("var/set_default_env") -%] + +clone_dir='[% c("basedir") %]/hg_clones/[% project %]' +mkdir -p "$clone_dir" +cd "$clone_dir" +tmpdir=$(mktemp -d) + +[% FOREACH lang = c('var/locales') %] + [% SET lang = tmpl(lang); + SET hgurl = "https://hg.mozilla.org/l10n-central/" _ lang %] + if test -d [% lang %] + then + cd [% lang %] + [% c("hg") %] pull [% hgurl %] + else + [% c("hg") %] clone [% hgurl %] [% lang %] + cd [% lang %] + fi + hg_hash=$([% c("basedir") %]/projects/firefox-locale-bundle/get_hg_hash \ + $rootdir/[% c('input_files_by_name/firefox_json') %] \ + [% lang %]) + [% c("hg") %] archive -r "$hg_hash" -t files "$tmpdir"/[% lang %] + cd .. +[% END %] + +tar -C "$tmpdir" -czf [% dest_dir %]/[% c("filename") %] . +rm -Rf "$tmpdir" diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config new file mode 100644 index 0000000..13c5fb8 --- /dev/null +++ b/projects/firefox-locale-bundle/config @@ -0,0 +1,12 @@ +# vim: filetype=yaml sw=2 +version: '[% c("var/ff_version") %]-[% c("var/ff_build") %]' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' + +var: + use_container: 0 + ff_version: '[% pc("firefox", "var/firefox_version") %]' + ff_build: build1 + +input_files: + - name: firefox_json + URL: 'https://product-details.mozilla.org/1.0/l10n/Firefox-[% c("var/ff_version") %]-[% c("var/ff_build") %].json' diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash new file mode 100755 index 0000000..0531113 --- /dev/null +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -0,0 +1,21 @@ +#!/usr/bin/perl -w +use strict; +use File::Slurp; +use JSON; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +exit_error("Wrong number of arguments", 1) unless @ARGV == 2; + +my ($file, $locale) = @ARGV; +my $json_text = read_file($file); +exit_error("Error reading $file", 2) unless defined $json_text; + +my $data = decode_json($json_text); + +my $changeset = $data->{locales}{$locale}{changeset}; +exit_error("Can't find locale $locale in $file", 3) unless $changeset; +print "$changeset\n";

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Update Torbutton submodule
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 9a300eedd12c23e1ce48484816df00f4c1a77033 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 21 22:21:36 2018 +0000 Update Torbutton submodule --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index ac8d92514940..a41034ced7a6 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit ac8d9251494056e761bb2cf5c2a4795a888f38bd +Subproject commit a41034ced7a6c0fe590320d9da61d15df1fef42f

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 27111: Configure tor browser for mobile to load about:tor
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit c0c87e1a9a6573ac480e4b46d232a4b451f6475c Author: Igor Oliveira <igt0(a)torproject.org> Date: Thu Nov 15 07:33:54 2018 -0200 Bug 27111: Configure tor browser for mobile to load about:tor - Add preferences.json: it is used to configure android specific preferences - Keep the ActivityStream HomePager closed when the user clicks in the url bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 2 -- mobile/android/torbrowser/assets/distribution/preferences.json | 10 ++++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 4a497f6999e0..5efd83398775 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -2734,8 +2734,6 @@ public class BrowserApp extends GeckoApp mBrowserToolbar.startEditing(url, animator); - showHomePagerWithAnimator(panelId, null, animator); - animator.start(); Telemetry.startUISession(TelemetryContract.Session.AWESOMESCREEN); } diff --git a/mobile/android/torbrowser/assets/distribution/preferences.json b/mobile/android/torbrowser/assets/distribution/preferences.json new file mode 100644 index 000000000000..bebd14967d8e --- /dev/null +++ b/mobile/android/torbrowser/assets/distribution/preferences.json @@ -0,0 +1,10 @@ +{ + "ApplicationPreferences": { + "newtab.load_homepage": true + }, + "AndroidPreferences": { + "homepage": "about:tor", + "startpane_enabled_after_57": true, + "startpane_enabled": true + } +}

1 0

[torbutton/master] Bug 27111: Update about:tor desktop version to work on mobile
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 61deb44d0c07eb1ec1d71eac2f0a7aeca87ea054 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Aug 29 07:31:26 2018 -0300 Bug 27111: Update about:tor desktop version to work on mobile Update torbutton, aboutTor(markup and styling) to work on mobile. --- src/chrome/content/aboutTor/aboutTor-content.js | 3 ++ src/chrome/content/aboutTor/aboutTor.xhtml | 2 ++ src/chrome/content/torbutton.js | 23 +++++++++++---- src/chrome/skin/aboutTor.css | 36 ++++++++++++++++++++++++ src/chrome/skin/torbrowser_mobile_logo.png | Bin 0 -> 9345 bytes 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index e8f5ffa2..d34bbe5c 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -119,6 +119,9 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); + if (aData.mobile) + body.setAttribute("mobile", "yes"); + // Setting body.initialized="yes" displays the body. body.setAttribute("initialized", "yes"); }, diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 9256748e..94dd13f3 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -18,6 +18,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> + <meta name="viewport" content="width=device-width, initial-scale=1"/> <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton-assets/aboutTor.css"/> @@ -73,6 +74,7 @@ window.addEventListener("pageshow", function() { </script> <div id="torstatus-version"/> <div class="torcontent-container"> + <img class="torcontent-logo" src="resource://torbutton-assets/torbrowser_mobile_logo.png"/> <div id="torstatus" class="top"> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> <div class="heading1">&aboutTor.ready.label;</div> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 90da5827..ee13f461 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -238,6 +238,10 @@ function torbutton_donation_banner_countdown() { } } +function torbutton_is_mobile() { + return Services.appinfo.OS === "Android"; +} + // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -408,11 +412,19 @@ function torbutton_init() { torbutton_update_toolbutton(); torbutton_notify_if_update_needed(); - createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, - m_tb_control_port, m_tb_control_pass, - "extensions.torbutton.display_circuit"); + try { + createTorCircuitDisplay(m_tb_control_ipc_file, m_tb_control_host, + m_tb_control_port, m_tb_control_pass, + "extensions.torbutton.display_circuit"); + } catch(e) { + torbutton_log(4, "Error creating the tor circuit display " + e); + } - torbutton_init_user_manual_links(); + try { + torbutton_init_user_manual_links(); + } catch(e) { + torbutton_log(4, "Error loading the user manual " + e); + } // Arrange for our about:tor content script to be loaded in each frame. window.messageManager.loadFrameScript( @@ -449,6 +461,7 @@ var torbutton_abouttor_message_handler = { // not working. get chromeData() { return { + mobile: torbutton_is_mobile(), torOn: torbutton_tor_check_ok() }; } @@ -1932,7 +1945,7 @@ function showSecurityPreferencesPanel(chromeWindow) { } function setupPreferencesForMobile() { - if (Services.appinfo.OS !== "Android") { + if (!torbutton_is_mobile()) { return; } diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 9f195cfd..60035a24 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -199,6 +199,8 @@ body:not([showmanual]) .showForManual { width: 100%; max-width: 2200px; /* room for our 20 circles */ overflow: hidden; + position: absolute; + bottom: 0px; } .onion-pattern-row { @@ -395,3 +397,37 @@ body[show-donation-banner="true"] #onboarding-overlay-button { transition: transform 0ms; position: absolute; } + +/* + * Mobile specific css + */ + +.torcontent-logo { + display: none; +} + +body[mobile] #torstatus-version, +body[mobile] .searchbox, +body[mobile] .top .heading2, +body[mobile] #bottom { + display: none; +} + +body[mobile] .top { + white-space: normal; + margin-top: 0px !important; +} + +body[mobile] .torcontent-logo { + display: block; + margin-top: 20px; + width: 50%; + height: auto; + margin-left: auto; + margin-right: auto; +} + +body[mobile] .top .heading1 { + font-size: 62px; + line-height: 1.1 +} diff --git a/src/chrome/skin/torbrowser_mobile_logo.png b/src/chrome/skin/torbrowser_mobile_logo.png new file mode 100644 index 00000000..9d8317f0 Binary files /dev/null and b/src/chrome/skin/torbrowser_mobile_logo.png differ

1 0

[torbutton/master] Bug 28093: Update donation banner style to make it fit in small screens
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit a41034ced7a6c0fe590320d9da61d15df1fef42f Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Nov 20 11:15:03 2018 -0200 Bug 28093: Update donation banner style to make it fit in small screens --- src/chrome/skin/aboutTor.css | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 60035a24..cf8290c9 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -431,3 +431,30 @@ body[mobile] .top .heading1 { font-size: 62px; line-height: 1.1 } + +body[mobile] #donation-banner { + position: static; +} + +body[mobile][show-donation-banner="true"] .torcontent-container, +body[mobile][show-donation-banner="true"] .onion-pattern-container { + transform: none; +} + +body[mobile][show-donation-banner="false"] .torcontent-container { + transform: translateY(-200px); +} + +@media only screen and (max-width: 480px) { + #donation-banner-image { + display: none; + } + + #donation-banner-lines { + align-items: stretch; + } + + #donation-banner-button { + text-align: center; + } +}

1 0

[tor-browser-build/master] Bug 28476: Enable android nightly builds
by boklm＠torproject.org 21 Nov '18

21 Nov '18

commit 80d0df6b8936729b26544cdb4535b5d1001feaf6 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 21 12:02:39 2018 +0100 Bug 28476: Enable android nightly builds Update testsuite_git_commit to enable android nightly builds. --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index af7e03d..5f04029 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 2 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/user/boklm/tor-browser-bundle-testsuite.git -testsuite_git_commit: 348ad855711382089c4fbf1badfec58e31a6c148 +testsuite_git_commit: 7b0dcd9f21bfde6b097b687c63f84fa579296804 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[torbutton/master] Bug 28540: New text for 2018 donation banner
by gk＠torproject.org 21 Nov '18

21 Nov '18

commit 1503b5e151cd8bb528f143f5fdf4513791d3f10f Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Nov 20 13:52:47 2018 -0800 Bug 28540: New text for 2018 donation banner --- src/chrome/locale/en-US/aboutTor.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/locale/en-US/aboutTor.dtd b/src/chrome/locale/en-US/aboutTor.dtd index 6efb202e..a36d812c 100644 --- a/src/chrome/locale/en-US/aboutTor.dtd +++ b/src/chrome/locale/en-US/aboutTor.dtd @@ -35,8 +35,13 @@ <!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> <!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> <!ENTITY aboutTor.donationBanner.line2f "We need your support!"> +<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> +<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> +<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> <!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> +<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> <!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> <!ENTITY aboutTor.donationBanner.buttonB "Count Me In">

1 0

[tor-browser-build/master] Bug 28472: Add Android Makefile Rules
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 836a8b56606978fa7a140cfd1a9d9ddb6b2e41e2 Author: sisbell <shane.isbell(a)gmail.com> Date: Thu Nov 15 20:27:38 2018 -0800 Bug 28472: Add Android Makefile Rules --- Makefile | 15 +++++++++++++++ projects/release/build | 4 ++++ projects/release/config | 11 +++++++++++ 3 files changed, 30 insertions(+) diff --git a/Makefile b/Makefile index 4c21a83..8ec5d0c 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,9 @@ all: release release: submodule-update $(rbm) build release --target release --target torbrowser-all +release-android-armv7: submodule-update + $(rbm) build release --target release --target torbrowser-android-armv7 + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -26,6 +29,9 @@ release-osx-x86_64: submodule-update alpha: submodule-update $(rbm) build release --target alpha --target torbrowser-all +alpha-android-armv7: submodule-update + $(rbm) build release --target alpha --target torbrowser-android-armv7 + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -47,6 +53,9 @@ alpha-osx-x86_64: submodule-update nightly: submodule-update $(rbm) build release --target nightly --target torbrowser-all +nightly-android-armv7: submodule-update + $(rbm) build release --target nightly --target torbrowser-android-armv7 + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -68,6 +77,9 @@ nightly-osx-x86_64: submodule-update alpha_nightly: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-all +alpha_nightly-android-armv7: submodule-update + $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 + alpha_nightly-linux-x86_64: submodule-update $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 @@ -86,6 +98,9 @@ alpha_nightly-osx-x86_64: submodule-update testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all +testbuild-android-armv7: submodule-update + $(rbm) build release --target testbuild --target torbrowser-android-armv7 + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/projects/release/build b/projects/release/build index 882d26d..2c9912f 100644 --- a/projects/release/build +++ b/projects/release/build @@ -4,6 +4,10 @@ [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" +[% IF c("var/torbrowser-android-armv7") -%] + mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ + [% RETURN %] +[% END -%] [% IF c("var/torbrowser-windows-i686") -%] mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/ diff --git a/projects/release/config b/projects/release/config index 8605aa2..65e297d 100644 --- a/projects/release/config +++ b/projects/release/config @@ -14,6 +14,10 @@ targets: - torbrowser-windows-i686 - torbrowser-windows-x86_64 - torbrowser-osx-x86_64 + - torbrowser-android-armv7 + torbrowser-android-armv7: + var: + torbrowser-android-armv7: 1 torbrowser-linux-x86_64: var: torbrowser-linux-x86_64: 1 @@ -80,6 +84,13 @@ targets: input_files: # Release + - name: android-armv7 + project: tor-browser + enable: '[% c("var/torbrowser-android-armv7") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-android-armv7 + - name: linux-x86_64 project: tor-browser enable: '[% c("var/torbrowser-linux-x86_64") %]'

1 0

[tor-browser-build/master] Bug 28468: Modify Android toolchain to support Orbot
by gk＠torproject.org 20 Nov '18

20 Nov '18

commit 5e3b6403e384198f0f85c482777970340333bc5a Author: sisbell <shane.isbell(a)gmail.com> Date: Fri Nov 16 12:18:52 2018 -0800 Bug 28468: Modify Android toolchain to support Orbot --- projects/android-toolchain/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 122ae5f..c14f90e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -13,6 +13,8 @@ var: export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle + export ANDROID_HOME=$ANDROID_SDK_HOME + export GRADLE_USER_HOME=$GRADLE_HOME google_repo: https://dl.google.com/android/repository input_files: - project: container-image

1 0