- tbb-commits - lists.torproject.org

[tor-browser-build/maint-8.5] build2 for up-to-date mobile translations
by gk＠torproject.org 15 May '19

15 May '19

commit 05e5754a4117a6c683e527fd6100a592a308c1f4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 07:58:35 2019 +0000 build2 for up-to-date mobile translations --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ca78d11..717cc6a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.0.9 project_name: tor-browser

1 0

[tor-browser-build/maint-8.5] Preparing build1 for 8.5
by gk＠torproject.org 15 May '19

15 May '19

commit 453ceb3d7fd4e0acf49f8bbe435021c6e149895b Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 07:40:53 2019 +0000 Preparing build1 for 8.5 Versions bump and Changelog update --- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 4 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 129 +++++++++++++++++++++ projects/tor-launcher/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 +- 7 files changed, 137 insertions(+), 8 deletions(-) diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2ea6db6..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index efc04da..ff58ef2 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 60.6.1 + firefox_platform_version: 60.7.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index d84cdf6..60776cb 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.1.31 +version: 2019.5.6.1 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f49c142..e83d390 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,132 @@ +Tor Browser 8.5 -- May 21 2019 + * All platforms + * Update Firefox to 60.7.0esr + * Update Torbutton to 2.1.8 + * Bug 25013: Integrate Torbutton into tor-browser for Android + * Bug 27111: Update about:tor desktop version to work on mobile + * Bug 22538+22513: Fix new circuit button for error pages + * Bug 25145: Update circuit display when back button is pressed + * Bug 27749: Opening about:config shows circuit from previous website + * Bug 30115: Map browser+domain to credentials to fix circuit display + * Bug 25702: Update Tor Browser icon to follow design guidelines + * Bug 21805: Add click-to-play button for WebGL + * Bug 28836: Links on about:tor are not clickable + * Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate + * Bug 29825: Intelligently add new Security Level button to taskbar + * Bug 29903: No WebGL click-to-play on the standard security level + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 25658: Replace security slider with security level UI + * Bug 28628: Change onboarding Security panel to open new Security Level panel + * Bug 29440: Update about:tor when Tor Browser is updated + * Bug 27478: Improved Torbutton icons for dark theme + * Bug 29239: Don't ship the Torbutton .xpi on mobile + * Bug 27484: Improve navigation within onboarding (strings) + * Bug 29768: Introduce new features to users (strings) + * Bug 28093: Update donation banner style to make it fit in small screens + * Bug 28543: about:tor has scroll bar between widths 900px and 1000px + * Bug 28039: Enable dump() if log method is 0 + * Bug 27701: Don't show App Blocker dialog on Android + * Bug 28187: Change tor circuit icon to torbutton.svg + * Bug 29943: Use locales in AB-CD scheme to match Mozilla + * Bug 26498: Add locale: es-AR + * Bug 28082: Add locales cs, el, hu, ka + * Bug 29973: Remove remaining stopOpenSecuritySettingsObserver() pieces + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 30425: Revert armagadd-on-2.0 changes + * Bug 30497: Add Donate link to about:tor + * Bug 30069: Use slider and about:tor localizations on mobile + * Bug 21263: Remove outdated information from the README + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + * Code clean-up + * Update HTTPS Everywhere to 2019.5.6.1 + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 29120: Enable media cache in memory + * Bug 24622: Proper first-party isolation of s3.amazonaws.com + * Bug 29082: Backport patches for bug 1469916 + * Bug 28711: Backport patches for bug 1474659 + * Bug 27828: "Check for Tor Browser update" doesn't seem to do anything + * Bug 29028: Auto-decline most canvas warning prompts again + * Bug 27919: Backport SSL status API + * Bug 27597: Fix our debug builds + * Bug 28082: Add locales cs, el, hu, ka + * Bug 26498: Add locale: es-AR + * Bug 29916: Make sure enterprise policies are disabled + * Bug 29349: Remove network.http.spdy.* overrides from meek helper user.js + * Bug 29327: TypeError: hostName is null on about:tor page + * Bug 30425: Revert armagadd-on-2.0 changes + * Windows + OS X + Linux + * Update OpenSSL to 1.0.2r + * Update Tor Launcher to 0.2.18.3 + * Bug 27994+25151: Use the new Tor Browser logo + * Bug 29328: Account for Tor 0.4.0.x's revised bootstrap status reporting + * Bug 22402: Improve "For assistance" link + * Bug 27994: Use the new Tor Browser logo + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Bug 27392: Update Moat URLs + * Bug 28082: Add locales cs, el, hu, ka + * Bug 26498: Add locale es-AR + * Bug 28039: Enable dump() if log method is 0 + * Translations update + * Bug 25702: Activity 1.1 Update Tor Browser icon to follow design guidelines + * Bug 28111: Use Tor Browser icon in identity box + * Bug 22343: Make 'Save Page As' obey first-party isolation + * Bug 29768: Introduce new features to users + * Bug 27484: Improve navigation within onboarding + * Bug 25658+29554: Replace security slider with security level UI + * Bug 25658+29554: Replace security slider with security level UI + * Bug 25405: Cannot use Moat if a meek bridge is configured + * Bug 28885: notify users that update is downloading + * Bug 29180: MAR download stalls when about dialog is opened + * Bug 27485: Users are not taught how to open security-slider dialog + * Bug 27486: Avoid about:blank tabs when opening onboarding pages + * Bug 29440: Update about:tor when Tor Browser is updated + * Bug 23359: WebExtensions icons are not shown on first start + * Bug 28628: Change onboarding Security panel to open new Security Level panel + * Bug 27905: Fix many occurrences of "Firefox" in about:preferences + * Bug 28369: Stop shipping pingsender executable + * Bug 30457: Remove defunct default bridges + * Windows + * Bug 27503: Improve screen reader accessibility + * Bug 27865: Tor Browser 8.5a2 is crashing on Windows + * Bug 22654: Firefox icon is shown for Tor Browser on Windows 10 start menu + * Bug 28874: Bump mingw-w64 commit to fix WebGL crash + * Bug 12885: Windows Jump Lists fail for Tor Browser + * Bug 28618: Set MOZILLA_OFFICIAL for Windows build + * Bug 21704: Abort install if CPU is missing SSE2 support + * Bug 28002: Fix the precomplete file in the en-US installer + * OS X + * Bug 27623: Use MOZILLA_OFFICIAL for our builds + * Linux + * Bug 28022: Use `/usr/bin/env bash` for bash invocation + * Bug 27623: Use MOZILLA_OFFICIAL for our builds + * Android + * Bug 5709: Ship Tor Browser for Android + * Build System + * All platforms + * Bug 29868: Fix installation of python-future package + * Bug 25623: Disable network during build + * Bug 25876: Generate source tarballs during build + * Bug 28685: Set Build ID based on Tor Browser version + * Bug 29194: Set DEBIAN_FRONTEND=noninteractive + * Bug 29167: Upgrade go to 1.11.5 + * Bug 29158: Install updated apt packages (CVE-2019-3462) + * Bug 29097: Don't try to install python3.6-lxml for HTTPS Everywhere + * Bug 27061: Enable verification of langpacks checksums + * Windows + * Bug 26148: Update binutils to 2.31.1 + * Bug 27320: Build certutil for Windows + * OS X + * Bug 27320: Build certutil for macOS + * Linux + * Bug 26323+29812: Build 32bit Linux bundles on 64bit Debian Wheezy + * Bug 26148: Update binutils to 2.31.1 + * Bug 29758: Build firefox debug symbols for linux-i686 + * Bug 29966: Use archive.debian.org for Wheezy images + * Bug 29183: Use linux-x86_64 langpacks on linux-x86_64 + * Android + * Bug 29981: Add option to build without using containers + Tor Browser 8.5a11 -- April 16 2019 * All platforms * Update Torbutton to 2.1.6 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 151f836..10e9d5a 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.18.2 +version: 0.2.18.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 5f3bbce..971f0e6 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.6 +version: 2.1.8 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 9e4fc78..ca78d11 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a11' + torbrowser_version: '8.5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5a10 + - 8.0.9 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/maint-8.5] Bug 30162: Tor Browser bootstrap process got stuck after interrupting it
by gk＠torproject.org 15 May '19

15 May '19

commit 05c9f970270441c071dc66b51034f4343a83c7de Author: sisbell <shane.isbell(a)gmail.com> Date: Sun May 5 22:52:33 2019 -0700 Bug 30162: Tor Browser bootstrap process got stuck after interrupting it Bug 30166: If custom bridges are specified, only use those bridges for connecting --- projects/tor-android-service/config | 2 +- projects/tor-android-service/gradle.patch | 21 +++++++-------- projects/tor-onion-proxy-library/config | 2 +- projects/tor-onion-proxy-library/maven-repo.patch | 32 +++++++++++++++++------ 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 5454c94..4708da4 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 6a9314aff4418a4edac33ff39fae266b097cf000 +git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-android-service/gradle.patch b/projects/tor-android-service/gradle.patch index 89347c9..3fff3e6 100644 --- a/projects/tor-android-service/gradle.patch +++ b/projects/tor-android-service/gradle.patch @@ -1,28 +1,28 @@ diff --git a/build.gradle b/build.gradle -index 178278e..d80d0b5 100644 +index 671edab..d9ecfef 100644 --- a/build.gradle +++ b/build.gradle -@@ -4,6 +4,7 @@ buildscript { +@@ -5,6 +5,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() + maven { url System.getenv("GRADLE_MAVEN_REPO") } } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" -@@ -19,6 +20,7 @@ allprojects { - jcenter() - maven { url "https://jitpack.io" } +@@ -20,5 +21,6 @@ allprojects { + mavenCentral() + maven { url "https://repo.spring.io/plugins-release" } maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url System.getenv("GRADLE_MAVEN_REPO") } } } - +\ No newline at end of file diff --git a/service/build.gradle b/service/build.gradle -index b414557..f57d9b3 100644 +index b414557..ae3e203 100644 --- a/service/build.gradle +++ b/service/build.gradle -@@ -16,13 +16,6 @@ android { +@@ -16,12 +16,6 @@ android { } } @@ -32,7 +32,6 @@ index b414557..f57d9b3 100644 - buildStagingDirectory "./outputs/ndk-build" - } - } -- + lintOptions { abortOnError false - } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index b9e1aa0..afd800f 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: be7206bba357bda11455b012bfcc0d42cc16c99d +git_hash: 27df20a5cb107a009db009df4aaef000a6e78e2e git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/maven-repo.patch b/projects/tor-onion-proxy-library/maven-repo.patch index 7062f8b..4c78aec 100644 --- a/projects/tor-onion-proxy-library/maven-repo.patch +++ b/projects/tor-onion-proxy-library/maven-repo.patch @@ -1,35 +1,51 @@ diff --git a/android/build.gradle b/android/build.gradle -index 1549581..ab919cf 100644 +index b6d8608..38093be 100644 --- a/android/build.gradle +++ b/android/build.gradle -@@ -8,6 +8,7 @@ buildscript { +@@ -7,6 +7,7 @@ buildscript { + mavenLocal() mavenCentral() google() - jcenter() + maven { url System.getenv("GRADLE_MAVEN_REPO") } } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" +@@ -82,6 +83,7 @@ repositories { + mavenCentral() + google() + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } ++ maven { url System.getenv("GRADLE_MAVEN_REPO") } + } + + /** diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle -index d2c02cf..d846254 100644 +index 1bc0343..7d8e886 100644 --- a/android_tor_installer/build.gradle +++ b/android_tor_installer/build.gradle -@@ -8,6 +8,7 @@ buildscript { +@@ -7,6 +7,7 @@ buildscript { + mavenLocal() mavenCentral() google() - jcenter() + maven { url System.getenv("GRADLE_MAVEN_REPO") } } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" +@@ -50,5 +51,6 @@ repositories { + google() + maven { url "https://repo.spring.io/plugins-release" } + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } ++ maven { url System.getenv("GRADLE_MAVEN_REPO") } + + } diff --git a/build.gradle b/build.gradle -index 43b9e13..8087ab7 100644 +index a269024..430f3e1 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ subprojects { mavenLocal() mavenCentral() - jcenter() + maven { url "https://repo.spring.io/plugins-release" } + maven { url System.getenv("GRADLE_MAVEN_REPO") } } } +

1 0

[tor-browser-build/maint-8.5] Pick up latest fixes for #30489
by gk＠torproject.org 15 May '19

15 May '19

commit 4de700976e02bfd6a710688b6441c652c938a724 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 07:30:40 2019 +0000 Pick up latest fixes for #30489 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 4708da4..a87422c 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d +git_hash: 28cc173eed552521a02b8edd94f4b7be8df7897f git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Pick up latest fixes for #30489
by gk＠torproject.org 15 May '19

15 May '19

commit f8a080343fd4a21b4ffc3246c082625569269dc4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 07:30:40 2019 +0000 Pick up latest fixes for #30489 --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 4708da4..a87422c 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d +git_hash: 28cc173eed552521a02b8edd94f4b7be8df7897f git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 30162: Tor Browser bootstrap process got stuck after interrupting it
by gk＠torproject.org 15 May '19

15 May '19

commit 9276f194da86c48792c8ebee23dd4e7056d01eae Author: sisbell <shane.isbell(a)gmail.com> Date: Sun May 5 22:52:33 2019 -0700 Bug 30162: Tor Browser bootstrap process got stuck after interrupting it Bug 30166: If custom bridges are specified, only use those bridges for connecting --- projects/tor-android-service/config | 2 +- projects/tor-android-service/gradle.patch | 21 +++++++-------- projects/tor-onion-proxy-library/config | 2 +- projects/tor-onion-proxy-library/maven-repo.patch | 32 +++++++++++++++++------ 4 files changed, 36 insertions(+), 21 deletions(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 5454c94..4708da4 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 6a9314aff4418a4edac33ff39fae266b097cf000 +git_hash: d5c9b1f569e1f04ccadeb75184cec0766c4c2f4d git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-android-service/gradle.patch b/projects/tor-android-service/gradle.patch index 89347c9..3fff3e6 100644 --- a/projects/tor-android-service/gradle.patch +++ b/projects/tor-android-service/gradle.patch @@ -1,28 +1,28 @@ diff --git a/build.gradle b/build.gradle -index 178278e..d80d0b5 100644 +index 671edab..d9ecfef 100644 --- a/build.gradle +++ b/build.gradle -@@ -4,6 +4,7 @@ buildscript { +@@ -5,6 +5,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() + maven { url System.getenv("GRADLE_MAVEN_REPO") } } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" -@@ -19,6 +20,7 @@ allprojects { - jcenter() - maven { url "https://jitpack.io" } +@@ -20,5 +21,6 @@ allprojects { + mavenCentral() + maven { url "https://repo.spring.io/plugins-release" } maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } + maven { url System.getenv("GRADLE_MAVEN_REPO") } } } - +\ No newline at end of file diff --git a/service/build.gradle b/service/build.gradle -index b414557..f57d9b3 100644 +index b414557..ae3e203 100644 --- a/service/build.gradle +++ b/service/build.gradle -@@ -16,13 +16,6 @@ android { +@@ -16,12 +16,6 @@ android { } } @@ -32,7 +32,6 @@ index b414557..f57d9b3 100644 - buildStagingDirectory "./outputs/ndk-build" - } - } -- + lintOptions { abortOnError false - } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index b9e1aa0..afd800f 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: be7206bba357bda11455b012bfcc0d42cc16c99d +git_hash: 27df20a5cb107a009db009df4aaef000a6e78e2e git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/maven-repo.patch b/projects/tor-onion-proxy-library/maven-repo.patch index 7062f8b..4c78aec 100644 --- a/projects/tor-onion-proxy-library/maven-repo.patch +++ b/projects/tor-onion-proxy-library/maven-repo.patch @@ -1,35 +1,51 @@ diff --git a/android/build.gradle b/android/build.gradle -index 1549581..ab919cf 100644 +index b6d8608..38093be 100644 --- a/android/build.gradle +++ b/android/build.gradle -@@ -8,6 +8,7 @@ buildscript { +@@ -7,6 +7,7 @@ buildscript { + mavenLocal() mavenCentral() google() - jcenter() + maven { url System.getenv("GRADLE_MAVEN_REPO") } } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" +@@ -82,6 +83,7 @@ repositories { + mavenCentral() + google() + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } ++ maven { url System.getenv("GRADLE_MAVEN_REPO") } + } + + /** diff --git a/android_tor_installer/build.gradle b/android_tor_installer/build.gradle -index d2c02cf..d846254 100644 +index 1bc0343..7d8e886 100644 --- a/android_tor_installer/build.gradle +++ b/android_tor_installer/build.gradle -@@ -8,6 +8,7 @@ buildscript { +@@ -7,6 +7,7 @@ buildscript { + mavenLocal() mavenCentral() google() - jcenter() + maven { url System.getenv("GRADLE_MAVEN_REPO") } } dependencies { classpath "com.android.tools.build:gradle:${androidplugin}" +@@ -50,5 +51,6 @@ repositories { + google() + maven { url "https://repo.spring.io/plugins-release" } + maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } ++ maven { url System.getenv("GRADLE_MAVEN_REPO") } + + } diff --git a/build.gradle b/build.gradle -index 43b9e13..8087ab7 100644 +index a269024..430f3e1 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ subprojects { mavenLocal() mavenCentral() - jcenter() + maven { url "https://repo.spring.io/plugins-release" } + maven { url System.getenv("GRADLE_MAVEN_REPO") } } } +

1 0

[tor-launcher/maint-0.2.18] Translations update
by gk＠torproject.org 15 May '19

15 May '19

commit 169a485c106df711d2f162548c78cbf237b888a4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:52:24 2019 +0000 Translations update --- src/chrome/locale/ko/torlauncher.properties | 98 ++++++++++++++--------------- src/chrome/locale/ur/network-settings.dtd | 28 ++++----- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 2e32da2..7b430b3 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -3,43 +3,43 @@ torlauncher.error_title=Tor 런처 -torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종료되었습니다. 이것은 torrc 파일의 오류, Tor 또는 시스템의 다른 프로그램의 버그 또는 하드웨어 결함으로 인한 것일 수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 때까지 Tor 브라우저는 시작되지 않습니다. +torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종료되었습니다. 이것은 torrc 파일의 오류, Tor 나 PC의 다른 프로그램의 버그, 혹은 하드웨어 결함으로 인한 것일 수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 때까지 Tor 브라우저는 시작되지 않습니다. torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 접속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 Tor 로그를 보내주십시오. -torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않음. +torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않습니다. torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결할 수 없습니다. -torlauncher.tor_failed_to_start=Tor 시작 실패. +torlauncher.tor_failed_to_start=Tor 시작에 실패했습니다. torlauncher.tor_control_failed=Tor 제어에 실패했습니다. -torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패 +torlauncher.tor_bootstrap_failed=Tor 네트워크 연결에 실패했습니다. torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S) torlauncher.unable_to_start_tor=Tor를 시작할 수 없습니다.\n\n%S torlauncher.tor_missing=Tor 실행 파일이 없습니다. torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 없습니다. torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 않으며 생성할 수 없습니다. -torlauncher.password_hash_missing=해쉬 암호 획득 실패 +torlauncher.password_hash_missing=해쉬 암호을 얻어오지 못 하였습니다. torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다.\n\n%S -torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시오. +torlauncher.ensure_tor_is_running=Tor가 실행중인지 확인하여 주십시오. -torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. +torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, IP주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. torlauncher.error_default_bridges_type_missing=제공된 브리지의 전송 유형을 선택해야합니다. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공 한 브리지 유효한 것이 아닙니다. 설정을 조정하십시오. +torlauncher.error_bridgedb_bridges_missing=브릿지를 요청해주세요. +torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공한 브리지는 유효하지 않습니다. 설정을 조정하십시오. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(중국에서 일하기) +torlauncher.bridge_suffix.meek-azure=(중국에서 일하기) -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. +torlauncher.request_a_bridge=브릿지 요청하기 +torlauncher.request_a_new_bridge=새로운 브릿지 요청하기 +torlauncher.contacting_bridgedb=브릿지DB에 연결하고 있으니, 잠시 기다려주세요. +torlauncher.captcha_prompt=브릿지를 요청하기 위해 CAPCHA를 풀어주세요. +torlauncher.bad_captcha_solution=풀이가 맞지 않습니다. 다시 시도해주세요. +torlauncher.unable_to_get_bridge=브릿지DB로터 브릿지를 얻어오지 못 하였습니다.\n\n%S +torlauncher.no_meek=이 브라우저는 브릿지 확보에 필요한 온전한 기능을 위해 설정되어 있지 않습니다. +torlauncher.no_bridges_available=지금은 사용할 수 있는 브릿지가 없습니다. 죄송합니다. torlauncher.connect=연결 torlauncher.restart_tor=Tor 재시작 @@ -47,40 +47,40 @@ torlauncher.quit=끝내기 torlauncher.quit_win=종료 torlauncher.done=완료 -torlauncher.forAssistance=지원자 연결 %S +torlauncher.forAssistance=도움이 필요하면, %S에 연락하십시오. torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오. -torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기 나 이메일 메시지에 붙여 넣을 수 있는 상태가 됩니다. +torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기나 이메일 메시지에 붙여넣을 수 있는 상태가 됩니다. torlauncher.bootstrapStatus.starting=시작중 -torlauncher.bootstrapStatus.conn_pt=Connecting to bridge -torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge -torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy -torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy -torlauncher.bootstrapStatus.conn=Connecting to a Tor relay -torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay -torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay -torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay +torlauncher.bootstrapStatus.conn_pt=브릿지에 연결하고 있습니다. +torlauncher.bootstrapStatus.conn_done_pt=브릿지에 연결되었습니다. +torlauncher.bootstrapStatus.conn_proxy=프록시에 연결하고 있습니다. +torlauncher.bootstrapStatus.conn_done_proxy=프록시에 연결되었습니다. +torlauncher.bootstrapStatus.conn=Tor 릴레이에 연결하고 있습니다. +torlauncher.bootstrapStatus.conn_done=Tor 릴레이에 연결되었습니다. +torlauncher.bootstrapStatus.handshake=Tor 릴레이와 네고하고 있습니다. +torlauncher.bootstrapStatus.handshake_done=Tor 릴레이와의 네고를 완료하였습니다. torlauncher.bootstrapStatus.onehop_create=경로와의 연결을 암호화해서 만들고 있어요 -torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오는중 -torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 요청중 -torlauncher.bootstrapStatus.loading_keys=권한 인증서를 로딩중 -torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청중 -torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 로딩중 -torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information -torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge -torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge -torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy -torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy -torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay -torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay -torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay -torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay -torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Tor 네트워크에 연결 성공! +torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오고 있습니다. +torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 불러오고 있습니다. +torlauncher.bootstrapStatus.loading_keys=인증서를 로딩하고 있습니다. +torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청하고 있습니다. +torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 불러오고 있습니다. +torlauncher.bootstrapStatus.enough_dirinfo=릴레이 정보 불러오기에 완료하였습니다. +torlauncher.bootstrapStatus.ap_conn_pt=우회로 연결: 브릿지에 연결하고 있습니다. +torlauncher.bootstrapStatus.ap_conn_done_pt=우회로 연결: 브릿지에 연결되었습니다. +torlauncher.bootstrapStatus.ap_conn_proxy=우회로 연결: 프록시에 연결하고 있습니다. +torlauncher.bootstrapStatus.ap_conn_done_proxy=우회로 연결: 프록시에 연결되었습니다. +torlauncher.bootstrapStatus.ap_conn=우회로 연결: Tor 릴레이에 연결하고 있습니다. +torlauncher.bootstrapStatus.ap_conn_done=우회로 연결: Tor 릴레이에 연결되었습니다. +torlauncher.bootstrapStatus.ap_handshake=우회로 연결: Tor 릴레이와 네고하고 있습니다. +torlauncher.bootstrapStatus.ap_handshake_done=우회로 연결: Tor 릴레이와의 네고가 끝났습니다. +torlauncher.bootstrapStatus.circuit_create=우회로 연결: Tor 우회로가 연결되었습니다. +torlauncher.bootstrapStatus.done=Tor 네트워크에 연결되었습니다. torlauncher.bootstrapWarning.done=완료 -torlauncher.bootstrapWarning.connectrefused=연결이 거부됨 +torlauncher.bootstrapWarning.connectrefused=연결이 거부되었습니다. torlauncher.bootstrapWarning.misc=기타 torlauncher.bootstrapWarning.resourcelimit=리소스 부족 torlauncher.bootstrapWarning.identity=계정 불일치 @@ -89,6 +89,6 @@ torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 torlauncher.bootstrapWarning.pt_missing=플러그가 가능한 전송을 찾을 수 없습니다 -torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. -torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. -torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. +torlauncher.nsresult.NS_ERROR_NET_RESET=서버와의 연결이 끊어졌습니다. +torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=서버와 연결할 수 없습니다. +torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=프록시와 연결할 수 없습니다. diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index eeb35c3..02b715d 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -1,24 +1,24 @@ -<!ENTITY torsettings.dialog.title "طور نیٹ ورک کے سیٹنگز"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "طور نیٹ ورک کے سیٹنگز"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.dialog.title "ٹور نیٹ ورک ترتیبات"> +<!ENTITY torsettings.wizard.title.default "ٹور کے ساتھ منسلک ہوں"> +<!ENTITY torsettings.wizard.title.configure "ٹور نیٹ ورک ترتیبات"> +<!ENTITY torsettings.wizard.title.connecting "ربط قائم کیا جارہا ہے">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> +<!ENTITY torlauncher.localePicker.title "ٹور براؤزر لغت"> +<!ENTITY torlauncher.localePicker.prompt "براہِ مہربانی لغت منتخب کیجئے">  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!ENTITY torSettings.connectPrompt "ٹور سے منسلک ہونے کے لئے "منسلک " پر کلک کریں"> <!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.configure "مرتب کریں"> +<!ENTITY torSettings.connect "منسلک">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.startingTor "ٹور چلنے کا انتظار ۔۔۔"> +<!ENTITY torsettings.restartTor "ٹور دوبارہ چلائیں"> +<!ENTITY torsettings.reconfigTor "دوبارہ مرتب کریں"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> <!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> @@ -31,8 +31,8 @@ <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "صارف کا نام"> -<!ENTITY torsettings.useProxy.password "پاس ورڈ "> +<!ENTITY torsettings.useProxy.username "صارف کا نام:"> +<!ENTITY torsettings.useProxy.password "پاس ورڈ :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">

1 0

[tor-launcher/maint-0.2.18] Release preparation for 0.2.18.3
by gk＠torproject.org 15 May '19

15 May '19

commit 143d8e45a1d9ac46a477001e18d4bfb438a72203 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:52:58 2019 +0000 Release preparation for 0.2.18.3 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 060b032..a6aa4a7 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.18.2</em:version> + <em:version>0.2.18.3</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

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29982 - Force single-pane UI on Tor Preferences
by gk＠torproject.org 15 May '19

15 May '19

commit 6a6052976627429027602a3b6871f0ae37aaa36d Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 14 19:57:56 2019 +0000 Bug 29982 - Force single-pane UI on Tor Preferences --- .../android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 87b752ab5991..2519fed4a8b1 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -131,6 +131,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { protected void onCreate(Bundle savedInstanceState) { // Begin with the first (Enable Bridges) fragment getIntent().putExtra(EXTRA_SHOW_FRAGMENT, sTorNetworkBridgesEnabledPreferenceName); + getIntent().putExtra(EXTRA_NO_HEADERS, true); super.onCreate(savedInstanceState); mFrag = null;

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 29982 - Force single-pane UI on Tor Preferences
by gk＠torproject.org 15 May '19

15 May '19

commit b914bb89ff0d07765c29a11ead947315f1e6d054 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue May 14 19:57:56 2019 +0000 Bug 29982 - Force single-pane UI on Tor Preferences --- .../android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index 87b752ab5991..2519fed4a8b1 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -131,6 +131,7 @@ public class TorPreferences extends AppCompatPreferenceActivity { protected void onCreate(Bundle savedInstanceState) { // Begin with the first (Enable Bridges) fragment getIntent().putExtra(EXTRA_SHOW_FRAGMENT, sTorNetworkBridgesEnabledPreferenceName); + getIntent().putExtra(EXTRA_NO_HEADERS, true); super.onCreate(savedInstanceState); mFrag = null;

1 0