- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 4: Adding a test case for testing letterboxing. r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 610ad333716499f5f9cf704a1dd97e07d276f572 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:36:29 2019 -0500 Bug 1407366 - Part 4: Adding a test case for testing letterboxing. r=johannh This patch adds a test for ensuring the letterboxing works as we expect. It will open a tab and resize its window into several different sizes and to see if the margins are correctly apply. And it will also check that no margin should apply to a tab with chrome privilege. --- .../resistfingerprinting/test/browser/browser.ini | 1 + .../browser/browser_dynamical_window_rounding.js | 277 +++++++++++++++++++++ modules/libpref/init/all.js | 3 + .../components/resistfingerprinting/RFPHelper.jsm | 35 ++- 4 files changed, 314 insertions(+), 2 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser.ini b/browser/components/resistfingerprinting/test/browser/browser.ini index 024ee29907b4..1aa918b4574b 100644 --- a/browser/components/resistfingerprinting/test/browser/browser.ini +++ b/browser/components/resistfingerprinting/test/browser/browser.ini @@ -11,6 +11,7 @@ support-files = head.js [browser_block_mozAddonManager.js] +[browser_dynamical_window_rounding.js] [browser_navigator.js] [browser_netInfo.js] [browser_performanceAPI.js] diff --git a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js new file mode 100644 index 000000000000..ea261b7820d7 --- /dev/null +++ b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js @@ -0,0 +1,277 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Bug 1407366 - A test case for reassuring the size of the content viewport is + * rounded if the window is resized when letterboxing is enabled. + */ + +const TEST_PATH = "http://example.net/browser/browser/components/resistfingerprinting/test/bro…"; + +const DEFAULT_ROUNDED_WIDTH_STEP = 200; +const DEFAULT_ROUNDED_HEIGHT_STEP = 100; + +// A set of test cases which defines the width and the height of the outer window. +const TEST_CASES = [ + {width: 1250, height: 1000}, + {width: 1500, height: 1050}, + {width: 1120, height: 760}, + {width: 800, height: 600}, + {width: 640, height: 400}, + {width: 500, height: 350}, + {width: 300, height: 170}, +]; + +function getPlatform() { + const {OS} = Services.appinfo; + if (OS == "WINNT") { + return "win"; + } else if (OS == "Darwin") { + return "mac"; + } + return "linux"; +} + +function handleOSFuzziness(aContent, aTarget) { + /* + * On Windows, we observed off-by-one pixel differences that + * couldn't be expained. When manually setting the window size + * to try to reproduce it; it did not occur. + */ + if (getPlatform() == "win") { + return Math.abs(aContent - aTarget) <= 1; + } + return aContent == aTarget; +} + +function checkForDefaultSetting( + aContentWidth, aContentHeight, aRealWidth, aRealHeight) { + // The default behavior for rounding is to round window with 200x100 stepping. + // So, we can get the rounded size by subtracting the remainder. + let targetWidth = aRealWidth - (aRealWidth % DEFAULT_ROUNDED_WIDTH_STEP); + let targetHeight = aRealHeight - (aRealHeight % DEFAULT_ROUNDED_HEIGHT_STEP); + + // This platform-specific code is explained in the large comment below. + if (getPlatform() != "linux") { + ok(handleOSFuzziness(aContentWidth, targetWidth), + `Default Dimensions: The content window width is correctly rounded into. ${aRealWidth}px -> ${aContentWidth}px should equal ${targetWidth}px`); + + ok(handleOSFuzziness(aContentHeight, targetHeight), + `Default Dimensions: The content window height is correctly rounded into. ${aRealHeight}px -> ${aContentHeight}px should equal ${targetHeight}px`); + + // Using ok() above will cause Win/Mac to fail on even the first test, we don't need to repeat it, return true so waitForCondition ends + return true; + } + // Returning true or false depending on if the test succeeded will cause Linux to repeat until it succeeds. + return handleOSFuzziness(aContentWidth, targetWidth) && handleOSFuzziness(aContentHeight, targetHeight); +} + +async function test_dynamical_window_rounding(aWindow, aCheckFunc) { + // We need to wait for the updating the margins for the newly opened tab, or + // it will affect the following tests. + let promiseForTheFirstRounding = + TestUtils.topicObserved("test:letterboxing:update-margin-finish"); + + info("Open a content tab for testing."); + let tab = await BrowserTestUtils.openNewForegroundTab( + aWindow.gBrowser, TEST_PATH + "file_dummy.html"); + + info("Wait until the margins are applied for the opened tab."); + await promiseForTheFirstRounding; + + let getContainerSize = (aTab) => { + let browserContainer = aWindow.gBrowser + .getBrowserContainer(aTab.linkedBrowser); + return { + containerWidth: browserContainer.clientWidth, + containerHeight: browserContainer.clientHeight, + }; + }; + + for (let {width, height} of TEST_CASES) { + let caseString = "Case " + width + "x" + height + ": "; + // Create a promise for waiting for the margin update. + let promiseRounding = + TestUtils.topicObserved("test:letterboxing:update-margin-finish"); + + let {containerWidth, containerHeight} = getContainerSize(tab); + + info(caseString + "Resize the window and wait until resize event happened (currently " + + containerWidth + "x" + containerHeight + ")"); + await new Promise(resolve => { + ({containerWidth, containerHeight} = getContainerSize(tab)); + info(caseString + "Resizing (currently " + containerWidth + "x" + containerHeight + ")"); + + aWindow.onresize = () => { + ({containerWidth, containerHeight} = getContainerSize(tab)); + info(caseString + "Resized (currently " + containerWidth + "x" + containerHeight + ")"); + if (getPlatform() == "linux" && containerWidth != width) { + /* + * We observed frequent test failures that resulted from receiving an onresize + * event where the browser was resized to an earlier requested dimension. This + * resize event happens on Linux only, and is an artifact of the asynchronous + * resizing. (See more discussion on 1407366#53) + * + * We cope with this problem in two ways. + * + * 1: If we detect that the browser was resized to the wrong value; we + * redo the resize. (This is the lines of code immediately following this + * comment) + * 2: We repeat the test until it works using waitForCondition(). But we still + * test Win/Mac more thoroughly: they do not loop in waitForCondition more + * than once, and can fail the test on the first attempt (because their + * check() functions use ok() while on Linux, we do not all ok() and instead + * rely on waitForCondition to fail). + * + * The logging statements in this test, and RFPHelper.jsm, help narrow down and + * illustrate the issue. + */ + info(caseString + "We hit the weird resize bug. Resize it again."); + aWindow.resizeTo(width, height); + } else { + resolve(); + } + }; + aWindow.resizeTo(width, height); + }); + + ({containerWidth, containerHeight} = getContainerSize(tab)); + info(caseString + "Waiting until margin has been updated on browser element. (currently " + + containerWidth + "x" + containerHeight + ")"); + await promiseRounding; + + info(caseString + "Get innerWidth/Height from the content."); + await BrowserTestUtils.waitForCondition(async () => { + let {contentWidth, contentHeight} = await ContentTask.spawn( + tab.linkedBrowser, null, () => { + return { + contentWidth: content.innerWidth, + contentHeight: content.innerHeight, + }; + }); + + info(caseString + "Check the result."); + return aCheckFunc(contentWidth, contentHeight, containerWidth, containerHeight); + }, "Default Dimensions: The content window width is correctly rounded into."); + } + + BrowserTestUtils.removeTab(tab); +} + +async function test_customize_width_and_height(aWindow) { + const test_dimensions = `120x80, 200x143, 335x255, 600x312, 742x447, 813x558, + 990x672, 1200x733, 1470x858`; + + await SpecialPowers.pushPrefEnv({"set": + [ + ["privacy.resistFingerprinting.letterboxing.dimensions", test_dimensions], + ], + }); + + let dimensions_set = test_dimensions.split(",").map(item => { + let sizes = item.split("x").map(size => parseInt(size, 10)); + + return { + width: sizes[0], + height: sizes[1], + }; + }); + + let checkDimension = + (aContentWidth, aContentHeight, aRealWidth, aRealHeight) => { + let matchingArea = aRealWidth * aRealHeight; + let minWaste = Number.MAX_SAFE_INTEGER; + let targetDimensions = undefined; + + // Find the dimensions which waste the least content area. + for (let dim of dimensions_set) { + if (dim.width > aRealWidth || dim.height > aRealHeight) { + continue; + } + + let waste = matchingArea - dim.width * dim.height; + + if (waste >= 0 && waste < minWaste) { + targetDimensions = dim; + minWaste = waste; + } + } + + // This platform-specific code is explained in the large comment above. + if (getPlatform() != "linux") { + ok(handleOSFuzziness(aContentWidth, targetDimensions.width), + `Custom Dimension: The content window width is correctly rounded into. ${aRealWidth}px -> ${aContentWidth}px should equal ${targetDimensions.width}`); + + ok(handleOSFuzziness(aContentHeight, targetDimensions.height), + `Custom Dimension: The content window height is correctly rounded into. ${aRealHeight}px -> ${aContentHeight}px should equal ${targetDimensions.height}`); + + // Using ok() above will cause Win/Mac to fail on even the first test, we don't need to repeat it, return true so waitForCondition ends + return true; + } + // Returning true or false depending on if the test succeeded will cause Linux to repeat until it succeeds. + return handleOSFuzziness(aContentWidth, targetDimensions.width) && handleOSFuzziness(aContentHeight, targetDimensions.height); + }; + + await test_dynamical_window_rounding(aWindow, checkDimension); + + await SpecialPowers.popPrefEnv(); +} + +async function test_no_rounding_for_chrome(aWindow) { + // First, resize the window to a size with is not rounded. + await new Promise(resolve => { + aWindow.onresize = () => resolve(); + aWindow.resizeTo(700, 450); + }); + + // open a chrome privilege tab, like about:config. + let tab = await BrowserTestUtils.openNewForegroundTab( + aWindow.gBrowser, "about:config"); + + // Check that the browser element should not have a margin. + is(tab.linkedBrowser.style.margin, "", "There is no margin around chrome tab."); + + BrowserTestUtils.removeTab(tab); +} + +add_task(async function setup() { + await SpecialPowers.pushPrefEnv({"set": + [ + ["privacy.resistFingerprinting.letterboxing", true], + ["privacy.resistFingerprinting.letterboxing.testing", true], + ], + }); +}); + +add_task(async function do_tests() { + // Store the original window size before testing. + let originalOuterWidth = window.outerWidth; + let originalOuterHeight = window.outerHeight; + + info("Run test for the default window rounding."); + await test_dynamical_window_rounding(window, checkForDefaultSetting); + + info("Run test for the window rounding with customized dimensions."); + await test_customize_width_and_height(window); + + info("Run test for no margin around tab with the chrome privilege."); + await test_no_rounding_for_chrome(window); + + // Restore the original window size. + window.outerWidth = originalOuterWidth; + window.outerHeight = originalOuterHeight; + + // Testing that whether the dynamical rounding works for new windows. + let win = await BrowserTestUtils.openNewBrowserWindow(); + + info("Run test for the default window rounding in new window."); + await test_dynamical_window_rounding(win, checkForDefaultSetting); + + info("Run test for the window rounding with customized dimensions in new window."); + await test_customize_width_and_height(win); + + info("Run test for no margin around tab with the chrome privilege in new window."); + await test_no_rounding_for_chrome(win); + + await BrowserTestUtils.closeWindow(win); +}); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 9dc30b8efe44..5b1d0a1c8972 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1414,6 +1414,9 @@ pref("privacy.resistFingerprinting", false); // If you do set it, to work around some broken website, please file a bug with // information so we can understand why it is needed. pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", true); +// The log level for browser console messages logged in RFPHelper.jsm +// Change to 'All' and restart to see the messages +pref("privacy.resistFingerprinting.jsmloglevel", "Warn"); // A subset of Resist Fingerprinting protections focused specifically on timers for testing // This affects the Animation API, the performance APIs, Date.getTime, Event.timestamp, // File.lastModified, audioContext.currentTime, canvas.captureStream.currentTime diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 4fb889ab16fe..2f3a1dd0e659 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -16,12 +16,26 @@ const kTopicHttpOnModifyRequest = "http-on-modify-request"; const kPrefLetterboxing = "privacy.resistFingerprinting.letterboxing"; const kPrefLetterboxingDimensions = "privacy.resistFingerprinting.letterboxing.dimensions"; +const kPrefLetterboxingTesting = + "privacy.resistFingerprinting.letterboxing.testing"; const kTopicDOMWindowOpened = "domwindowopened"; const kEventLetterboxingSizeUpdate = "Letterboxing:ContentSizeUpdated"; const kDefaultWidthStepping = 200; const kDefaultHeightStepping = 100; +var logConsole; +function log(msg) { + if (!logConsole) { + logConsole = console.createInstance({ + prefix: "RFPHelper.jsm", + maxLogLevelPref: "privacy.resistFingerprinting.jsmloglevel", + }); + } + + logConsole.log(msg); +} + class _RFPHelper { // ============================================================================ // Shared Setup @@ -41,6 +55,8 @@ class _RFPHelper { Services.prefs.addObserver(kPrefLetterboxing, this); XPCOMUtils.defineLazyPreferenceGetter(this, "_letterboxingDimensions", kPrefLetterboxingDimensions, "", null, this._parseLetterboxingDimensions); + XPCOMUtils.defineLazyPreferenceGetter(this, "_isLetterboxingTesting", + kPrefLetterboxingTesting, false); // Add RFP and Letterboxing observers if prefs are enabled this._handleResistFingerprintingChanged(); @@ -326,6 +342,8 @@ class _RFPHelper { * content viewport. */ async _roundContentView(aBrowser) { + let logId = Math.random(); + log("_roundContentView[" + logId + "]"); let win = aBrowser.ownerGlobal; let browserContainer = aBrowser.getTabBrowser() .getBrowserContainer(aBrowser); @@ -345,14 +363,21 @@ class _RFPHelper { }; }); + log("_roundContentView[" + logId + "] contentWidth=" + contentWidth + " contentHeight=" + contentHeight + + " containerWidth=" + containerWidth + " containerHeight=" + containerHeight + " "); + let calcMargins = (aWidth, aHeight) => { + let result; + log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ")"); // If the set is empty, we will round the content with the default // stepping size. if (!this._letterboxingDimensions.length) { - return { + result = { width: (aWidth % kDefaultWidthStepping) / 2, height: (aHeight % kDefaultHeightStepping) / 2, }; + log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ") = " + result.width + " x " + result.height); + return result; } let matchingArea = aWidth * aHeight; @@ -375,7 +400,6 @@ class _RFPHelper { } } - let result; // If we cannot find any dimensions match to the real content window, this // means the content area is smaller the smallest size in the set. In this // case, we won't apply any margins. @@ -391,6 +415,7 @@ class _RFPHelper { }; } + log("_roundContentView[" + logId + "] calcMargins(" + aWidth + ", " + aHeight + ") = " + result.width + " x " + result.height); return result; }; @@ -401,10 +426,16 @@ class _RFPHelper { // If the size of the content is already quantized, we do nothing. if (aBrowser.style.margin == `${margins.height}px ${margins.width}px`) { + log("_roundContentView[" + logId + "] is_rounded == true"); + if (this._isLetterboxingTesting) { + log("_roundContentView[" + logId + "] is_rounded == true test:letterboxing:update-margin-finish"); + Services.obs.notifyObservers(null, "test:letterboxing:update-margin-finish"); + } return; } win.requestAnimationFrame(() => { + log("_roundContentView[" + logId + "] setting margins to " + margins.width + " x " + margins.height); // One cannot (easily) control the color of a margin unfortunately. // An initial attempt to use a border instead of a margin resulted // in offset event dispatching; so for now we use a colorless margin.

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 2: Rearrange RFPHelper for expansion r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 7f3ce3ef4cf86690864a4abd7ca58a9e5dbb087f Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:17:53 2019 -0500 Bug 1407366 - Part 2: Rearrange RFPHelper for expansion r=johannh This patch rearranges RFPHelper.jsm to make it more clear what parts of the file are responsible for what feature. --- .../components/resistfingerprinting/RFPHelper.jsm | 62 +++++++++++++--------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm index 2e8e85072364..5aef203ad38b 100755 --- a/toolkit/components/resistfingerprinting/RFPHelper.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -14,6 +14,9 @@ const kPrefSpoofEnglish = "privacy.spoof_english"; const kTopicHttpOnModifyRequest = "http-on-modify-request"; class _RFPHelper { + // ============================================================================ + // Setup + // ============================================================================ constructor() { this._initialized = false; } @@ -24,7 +27,9 @@ class _RFPHelper { } this._initialized = true; + // Add unconditional observers Services.prefs.addObserver(kPrefResistFingerprinting, this); + // Add RFP observers if the pref is enabled this._handleResistFingerprintingChanged(); } @@ -34,8 +39,10 @@ class _RFPHelper { } this._initialized = false; + // Remove unconditional observers Services.prefs.removeObserver(kPrefResistFingerprinting, this); - this._removeObservers(); + // Remove the RFP observers, swallowing exceptions if they weren't present + this._removeRFPObservers(); } observe(subject, topic, data) { @@ -51,24 +58,6 @@ class _RFPHelper { } } - _removeObservers() { - try { - Services.pref.removeObserver(kPrefSpoofEnglish, this); - } catch (e) { - // do nothing - } - try { - Services.obs.removeObserver(this, kTopicHttpOnModifyRequest); - } catch (e) { - // do nothing - } - } - - _shouldPromptForLanguagePref() { - return (Services.locale.getAppLocaleAsLangTag().substr(0, 2) !== "en") - && (Services.prefs.getIntPref(kPrefSpoofEnglish) === 0); - } - _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: @@ -82,14 +71,34 @@ class _RFPHelper { } } + // ============================================================================ + // Language Prompt + // ============================================================================ + _addRFPObservers() { + Services.prefs.addObserver(kPrefSpoofEnglish, this); + if (this._shouldPromptForLanguagePref()) { + Services.obs.addObserver(this, kTopicHttpOnModifyRequest); + } + } + + _removeRFPObservers() { + try { + Services.pref.removeObserver(kPrefSpoofEnglish, this); + } catch (e) { + // do nothing + } + try { + Services.obs.removeObserver(this, kTopicHttpOnModifyRequest); + } catch (e) { + // do nothing + } + } + _handleResistFingerprintingChanged() { if (Services.prefs.getBoolPref(kPrefResistFingerprinting)) { - Services.prefs.addObserver(kPrefSpoofEnglish, this); - if (this._shouldPromptForLanguagePref()) { - Services.obs.addObserver(this, kTopicHttpOnModifyRequest); - } + this._addRFPObservers(); } else { - this._removeObservers(); + this._removeRFPObservers(); Services.prefs.setIntPref(kPrefSpoofEnglish, 0); } } @@ -116,6 +125,11 @@ class _RFPHelper { } } + _shouldPromptForLanguagePref() { + return (Services.locale.getAppLocaleAsLangTag().substr(0, 2) !== "en") + && (Services.prefs.getIntPref(kPrefSpoofEnglish) === 0); + } + _handleHttpOnModifyRequest(subject, data) { // If we are loading an HTTP page from content, show the // "request English language web pages?" prompt.

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 1: Rename the LanguagePrompt.jsm to RFPHelper.jsm and changing the place of doing uninitialization. r=johannh
by gk＠torproject.org 17 May '19

17 May '19

commit 0958b375400c51ddd1c61cda14acae686697729b Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:13:27 2019 -0500 Bug 1407366 - Part 1: Rename the LanguagePrompt.jsm to RFPHelper.jsm and changing the place of doing uninitialization. r=johannh This patch changes the name of LanguagePrompt.jsm to RFPHelper.jsm. The RFPHelper is going to not only be responsible for the language --- browser/base/content/browser.js | 4 +--- browser/components/nsBrowserGlue.js | 5 +++-- .../resistfingerprinting/{LanguagePrompt.jsm => RFPHelper.jsm} | 6 +++--- toolkit/components/resistfingerprinting/moz.build | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 16e712be0ba3..3e3b1b203219 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -29,7 +29,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { E10SUtils: "resource://gre/modules/E10SUtils.jsm", ExtensionsUI: "resource:///modules/ExtensionsUI.jsm", FormValidationHandler: "resource:///modules/FormValidationHandler.jsm", - LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm", LightweightThemeConsumer: "resource://gre/modules/LightweightThemeConsumer.jsm", LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm", Log: "resource://gre/modules/Log.jsm", @@ -47,6 +46,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { PromiseUtils: "resource://gre/modules/PromiseUtils.jsm", ReaderMode: "resource://gre/modules/ReaderMode.jsm", ReaderParent: "resource:///modules/ReaderParent.jsm", + RFPHelper: "resource://gre/modules/RFPHelper.jsm", RecentWindow: "resource:///modules/RecentWindow.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", @@ -1908,8 +1908,6 @@ var gBrowserInit = { gAccessibilityServiceIndicator.uninit(); - LanguagePrompt.uninit(); - BrowserSearch.uninit(); // Now either cancel delayedStartup, or clean up the services initialized from diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js index 861a62e442df..564035bfd3a2 100644 --- a/browser/components/nsBrowserGlue.js +++ b/browser/components/nsBrowserGlue.js @@ -104,7 +104,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { HybridContentTelemetry: "resource://gre/modules/HybridContentTelemetry.jsm", Integration: "resource://gre/modules/Integration.jsm", L10nRegistry: "resource://gre/modules/L10nRegistry.jsm", - LanguagePrompt: "resource://gre/modules/LanguagePrompt.jsm", LightweightThemeManager: "resource://gre/modules/LightweightThemeManager.jsm", LoginHelper: "resource://gre/modules/LoginHelper.jsm", LoginManagerParent: "resource://gre/modules/LoginManagerParent.jsm", @@ -126,6 +125,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { ReaderParent: "resource:///modules/ReaderParent.jsm", RecentWindow: "resource:///modules/RecentWindow.jsm", RemotePrompt: "resource:///modules/RemotePrompt.jsm", + RFPHelper: "resource://gre/modules/RFPHelper.jsm", SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm", Sanitizer: "resource:///modules/Sanitizer.jsm", SessionStore: "resource:///modules/sessionstore/SessionStore.jsm", @@ -1058,6 +1058,7 @@ BrowserGlue.prototype = { } Normandy.uninit(); + RFPHelper.uninit(); }, // All initial windows have opened. @@ -1220,7 +1221,7 @@ BrowserGlue.prototype = { } Services.tm.idleDispatchToMainThread(() => { - LanguagePrompt.init(); + RFPHelper.init(); }); Services.tm.idleDispatchToMainThread(() => { diff --git a/toolkit/components/resistfingerprinting/LanguagePrompt.jsm b/toolkit/components/resistfingerprinting/RFPHelper.jsm old mode 100644 new mode 100755 similarity index 98% rename from toolkit/components/resistfingerprinting/LanguagePrompt.jsm rename to toolkit/components/resistfingerprinting/RFPHelper.jsm index d27402ccacf1..2e8e85072364 --- a/toolkit/components/resistfingerprinting/LanguagePrompt.jsm +++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ "use strict"; -var EXPORTED_SYMBOLS = ["LanguagePrompt"]; +var EXPORTED_SYMBOLS = ["RFPHelper"]; ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -13,7 +13,7 @@ const kPrefResistFingerprinting = "privacy.resistFingerprinting"; const kPrefSpoofEnglish = "privacy.spoof_english"; const kTopicHttpOnModifyRequest = "http-on-modify-request"; -class _LanguagePrompt { +class _RFPHelper { constructor() { this._initialized = false; } @@ -200,4 +200,4 @@ class _LanguagePrompt { } } -let LanguagePrompt = new _LanguagePrompt(); +let RFPHelper = new _RFPHelper(); diff --git a/toolkit/components/resistfingerprinting/moz.build b/toolkit/components/resistfingerprinting/moz.build index 88525f6189eb..021f2786f966 100644 --- a/toolkit/components/resistfingerprinting/moz.build +++ b/toolkit/components/resistfingerprinting/moz.build @@ -21,5 +21,5 @@ EXPORTS.mozilla += [ ] EXTRA_JS_MODULES += [ - 'LanguagePrompt.jsm', + 'RFPHelper.jsm', ]

1 0

[tor-browser/tor-browser-60.6.1esr-9.0-1] Bug 1407366 - Part 5: Reset the Zoom in browser_bug1369357_site_specific_zoom_level.js r=johann
by gk＠torproject.org 17 May '19

17 May '19

commit 003019c16626dc515d5fe9defb999be1ab8ad397 Author: Tom Ritter <tom(a)mozilla.com> Date: Wed Apr 24 09:37:12 2019 -0500 Bug 1407366 - Part 5: Reset the Zoom in browser_bug1369357_site_specific_zoom_level.js r=johann This test changes the browser zoom level; but does not reset it; causing subsequant tests to be run with a zoom. This may cause them to fail. --- .../test/browser/browser_bug1369357_site_specific_zoom_level.js | 2 ++ .../test/browser/browser_dynamical_window_rounding.js | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js b/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js index b4af91ebf980..4a4c36015b5c 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js +++ b/browser/components/resistfingerprinting/test/browser/browser_bug1369357_site_specific_zoom_level.js @@ -25,6 +25,8 @@ add_task(async function() { isnot(tab3Zoom, tab1Zoom, "privacy.resistFingerprinting is true, site-specific zoom level should be disabled"); + await FullZoom.reset(); + await BrowserTestUtils.removeTab(tab1); await BrowserTestUtils.removeTab(tab2); await BrowserTestUtils.removeTab(tab3); diff --git a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js index ea261b7820d7..ae8055a49ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js +++ b/browser/components/resistfingerprinting/test/browser/browser_dynamical_window_rounding.js @@ -4,6 +4,10 @@ * * Bug 1407366 - A test case for reassuring the size of the content viewport is * rounded if the window is resized when letterboxing is enabled. + * + * A helpful note: if this test starts randomly failing; it may be because the + * zoom level was not reset by an earlier-run test. See Bug 1407366 for an + * example. */ const TEST_PATH = "http://example.net/browser/browser/components/resistfingerprinting/test/bro…";

1 0

[torbutton/master] Bug 30464: Add WebGL to safer descriptions
by gk＠torproject.org 17 May '19

17 May '19

commit f4836d963fb71af377d6834a6a2bd58663afbac8 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 10 09:31:47 2019 +0000 Bug 30464: Add WebGL to safer descriptions --- src/chrome/locale/en-US/securityLevel.properties | 4 ++-- src/chrome/locale/en-US/torbutton.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en-US/securityLevel.properties b/src/chrome/locale/en-US/securityLevel.properties index 6ccbb033..1b941b5c 100644 --- a/src/chrome/locale/en-US/securityLevel.properties +++ b/src/chrome/locale/en-US/securityLevel.properties @@ -9,7 +9,7 @@ securityLevel.safer.tooltip = Security Level : Safer securityLevel.safer.summary = Disables website features that are often dangerous, causing some sites to lose functionality. securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites. securityLevel.safer.description2 = Some fonts and math symbols are disabled. -securityLevel.safer.description3 = Audio and video (HTML5 media) are click-to-play. +securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL are click-to-play. securityLevel.safest.level = Safest securityLevel.safest.tooltip = Security Level : Safest securityLevel.safest.summary = Only allows website features required for static sites and basic services. These changes affect images, media, and scripts. @@ -19,4 +19,4 @@ securityLevel.safest.description3 = Audio and video (HTML5 media) are click-to-p securityLevel.custom.summary = Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels. securityLevel.learnMore = Learn more securityLevel.restoreDefaults = Restore Defaults -securityLevel.advancedSecuritySettings = Advanced Security Settings… \ No newline at end of file +securityLevel.advancedSecuritySettings = Advanced Security Settings… diff --git a/src/chrome/locale/en-US/torbutton.dtd b/src/chrome/locale/en-US/torbutton.dtd index 83b1ffb5..2e106f60 100644 --- a/src/chrome/locale/en-US/torbutton.dtd +++ b/src/chrome/locale/en-US/torbutton.dtd @@ -36,6 +36,6 @@ <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> <!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play."> +<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> <!ENTITY torbutton.circuit_display.title "Tor Circuit"> <!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">

1 0

[torbutton/master] Merge branch 'bug_30464'
by gk＠torproject.org 17 May '19

17 May '19

commit 24ff29e3a854ee6c4f5ad5b1004ce212cddeb2e4 Merge: 0e3106d2 f4836d96 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 17 05:59:23 2019 +0000 Merge branch 'bug_30464' src/chrome/locale/en-US/securityLevel.properties | 4 ++-- src/chrome/locale/en-US/torbutton.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/maint-8.5] Picking up last minute mobile fixes for build3
by gk＠torproject.org 16 May '19

16 May '19

commit 309770d10424a275be08d715edbbb9089a5c15bc Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 16 21:54:08 2019 +0000 Picking up last minute mobile fixes for build3 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 717cc6a..54f6c65 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 8.0.9 project_name: tor-browser

1 0

[tor-browser-build/maint-8.5] Bug 30284: Fix broken start-up on KitKat devices
by gk＠torproject.org 16 May '19

16 May '19

commit 3d15fd5126abc6cc5166f38e2f936ab87b8a5a76 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 16 21:45:37 2019 +0000 Bug 30284: Fix broken start-up on KitKat devices Fix by sisbell --- projects/tor-onion-proxy-library/30284.patch | 22 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 24 insertions(+) diff --git a/projects/tor-onion-proxy-library/30284.patch b/projects/tor-onion-proxy-library/30284.patch new file mode 100644 index 0000000..a3594b9 --- /dev/null +++ b/projects/tor-onion-proxy-library/30284.patch @@ -0,0 +1,22 @@ +From 4402f247643c7b3b730f0facaf1c45dc02d5721f Mon Sep 17 00:00:00 2001 +From: sisbell <shane.isbell(a)gmail.com> +Date: Thu, 16 May 2019 21:33:06 +0000 +Subject: [PATCH] Fixes thaliproject#120: Tor Startup Broken on KitKat Devices + + +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java +index 3df0f12..1ab7c2d 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfig.java +@@ -372,7 +372,7 @@ public final class TorConfig { + public TorConfig build() { + if(homeDir == null) { + String userHome = System.getProperty("user.home"); +- homeDir = (userHome != null && !"".equals(userHome)) ? new File(userHome) : configDir; ++ homeDir = (userHome != null && !"".equals(userHome) && !"/".equals(userHome)) ? new File(userHome) : configDir; + } + + if (torExecutableFile == null) { +-- +2.20.1 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index defedde..e674061 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -20,6 +20,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/maven-repo.patch patch -p1 < $rootdir/add_socks_port_flags.patch +patch -p1 < $rootdir/30284.patch # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 889b30d..9db33bd 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -30,3 +30,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: maven-repo.patch - filename: add_socks_port_flags.patch + - filename: 30284.patch

1 0

[tor-browser-build/master] Bug 30518 - Add SocksPort flags for consistency across platforms
by gk＠torproject.org 16 May '19

16 May '19

commit 619cf8e9c1826812936b491711f67107aaf24fe7 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu May 16 18:51:30 2019 +0000 Bug 30518 - Add SocksPort flags for consistency across platforms --- .../tor-onion-proxy-library/add_socks_port_flags.patch | 14 ++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 16 insertions(+) diff --git a/projects/tor-onion-proxy-library/add_socks_port_flags.patch b/projects/tor-onion-proxy-library/add_socks_port_flags.patch new file mode 100644 index 0000000..84aefc9 --- /dev/null +++ b/projects/tor-onion-proxy-library/add_socks_port_flags.patch @@ -0,0 +1,14 @@ +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index 731fb3e..e0d0c42 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -395,6 +395,9 @@ public final class TorConfigBuilder { + if (!isNullOrEmpty(isolationFlag)) { + buffer.append(" ").append(isolationFlag); + } ++ buffer.append(" KeepAliveIsolateSOCKSAuth"); ++ buffer.append(" IPv6Traffic"); ++ buffer.append(" PreferIPv6"); + buffer.append('\n'); + return this; + } diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 5844076..defedde 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -19,6 +19,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/maven-repo.patch +patch -p1 < $rootdir/add_socks_port_flags.patch # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index afd800f..889b30d 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -29,3 +29,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: maven-repo.patch + - filename: add_socks_port_flags.patch

1 0

[tor-browser-build/maint-8.5] Bug 30518 - Add SocksPort flags for consistency across platforms
by gk＠torproject.org 16 May '19

16 May '19

commit a9fa9bf0e3bb67c235e677f02ac5f3a5b74dfb59 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu May 16 18:51:30 2019 +0000 Bug 30518 - Add SocksPort flags for consistency across platforms --- .../tor-onion-proxy-library/add_socks_port_flags.patch | 14 ++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 16 insertions(+) diff --git a/projects/tor-onion-proxy-library/add_socks_port_flags.patch b/projects/tor-onion-proxy-library/add_socks_port_flags.patch new file mode 100644 index 0000000..84aefc9 --- /dev/null +++ b/projects/tor-onion-proxy-library/add_socks_port_flags.patch @@ -0,0 +1,14 @@ +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index 731fb3e..e0d0c42 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -395,6 +395,9 @@ public final class TorConfigBuilder { + if (!isNullOrEmpty(isolationFlag)) { + buffer.append(" ").append(isolationFlag); + } ++ buffer.append(" KeepAliveIsolateSOCKSAuth"); ++ buffer.append(" IPv6Traffic"); ++ buffer.append(" PreferIPv6"); + buffer.append('\n'); + return this; + } diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 5844076..defedde 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -19,6 +19,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/maven-repo.patch +patch -p1 < $rootdir/add_socks_port_flags.patch # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.1/bin/gradle --offline -P androidplugin=3.0.1 assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index afd800f..889b30d 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -29,3 +29,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: maven-repo.patch + - filename: add_socks_port_flags.patch

1 0

[tor-browser-build/maint-8.5] Bug 30404: Remove Orbot Project
by gk＠torproject.org 16 May '19

16 May '19

commit 1a6a3be5ad0c05ce5c31f0036e7fdbba12796695 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun May 5 17:46:44 2019 -0700 Bug 30404: Remove Orbot Project --- projects/firefox/build | 3 +- projects/firefox/config | 3 - .../0001-Bug-28051-Build-Orbot-as-a-library.patch | 261 ---- .../0002-Bug-28051-Exclude-the-AppUpdater.patch | 39 - ...-Bug-28051-Delete-the-Onboarding-activity.patch | 208 --- ...ename-the-Hidden-Service-content-provider.patch | 308 ---- .../0005-Bug-28051-Cast-the-layout-elements.patch | 81 -- ...on-t-use-Orbot-s-LocaleHelper-for-locale-.patch | 129 -- ...ename-Orbot-s-preferences-so-they-don-t-c.patch | 53 - ...ake-TorService-compatible-with-the-suppor.patch | 49 - ...1-Change-Orbot-s-behavior-for-Tor-Browser.patch | 150 -- ...010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch | 1532 -------------------- ...ell-Proguard-it-should-keep-an-unused-met.patch | 32 - ...Bug-28051-Escape-the-apostrophe-correctly.patch | 64 - ...51-Add-a-notification-compatibility-class.patch | 221 --- .../0014-Bug-29794-Update-built-in-bridges.patch | 34 - projects/orbot/0015-dependencies.patch | 29 - projects/orbot/build | 38 - projects/orbot/config | 52 - projects/orbot/gradle-dependencies-list.txt | 193 --- projects/orbot/set_gradle_repo_to_local.patch | 19 - 21 files changed, 1 insertion(+), 3497 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index 0fd5b99..c15aac2 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -105,8 +105,7 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo cp -r $gradle_repo/plugins-release/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo - # Move orbot files so they will be included in the apk during the build - cp $rootdir/[% c('input_files_by_name/orbot') %]/* mobile/android/app + # Move Android library dependencies so they will be included in the apk during the build cp $rootdir/[% c('input_files_by_name/topl') %]/* mobile/android/app cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* mobile/android/app # Apply patches diff --git a/projects/firefox/config b/projects/firefox/config index ff58ef2..35dac3a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -160,9 +160,6 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' enable: '[% c("var/android") %]' - - project: orbot - name: orbot - enable: '[% c("var/android") %]' - project: tor-android-service name: tor-android-service enable: '[% c("var/android") %]' diff --git a/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch b/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch deleted file mode 100644 index 3b34dec..0000000 --- a/projects/orbot/0001-Bug-28051-Build-Orbot-as-a-library.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 6a7ccfc48d3ec930390cabfd460730915215f674 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:32:56 +0000 -Subject: [PATCH 01/13] Bug 28051 - Build Orbot as a library - ---- - app/build.gradle | 31 ++++++++++++++++++++----------- - app/src/main/AndroidManifest.xml | 32 +++++++++++++++++++------------- - build.gradle | 3 ++- - jsocksAndroid/build.gradle | 8 +++++--- - orbotservice/build.gradle | 11 +++++++---- - 5 files changed, 53 insertions(+), 32 deletions(-) - -diff --git a/app/build.gradle b/app/build.gradle -index ba57f72c..3051dd5c 100644 ---- a/app/build.gradle -+++ b/app/build.gradle -@@ -1,12 +1,16 @@ --apply plugin: 'com.android.application' -+// Build it as a library, instead of an app -+apply plugin: 'com.android.library' - - android { -- compileSdkVersion 27 -- buildToolsVersion '27.0.3' -+ // Match Fennec's version -+ compileSdkVersion 26 -+ buildToolsVersion '26.0.2' - defaultConfig { -- applicationId "org.torproject.android" -+ // Libraries can't have an applicationId -+ //applicationId "org.torproject.android" - minSdkVersion 16 -- targetSdkVersion 27 -+ // Match Fennec's version -+ targetSdkVersion 26 - } - lintOptions { - checkReleaseBuilds false -@@ -17,7 +21,8 @@ android { - buildTypes { - release { - minifyEnabled true -- shrinkResources true -+ // Match Fennec -+ shrinkResources false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } -@@ -32,8 +37,10 @@ android { - fullperm { - dimension "free" - minSdkVersion 16 -- applicationId 'org.torproject.android' -- targetSdkVersion 27 -+ // Libraries can't have an applicationId -+ //applicationId 'org.torproject.android' -+ // Match Fennec's versions -+ targetSdkVersion 26 - versionCode 16050100 - versionName '16.0.5-RC-1-tor-0.3.4.9' - archivesBaseName = "Orbot-$versionName" -@@ -70,9 +77,11 @@ dependencies { - // implementation 'com.github.delight-im:Android-Languages:v1.0.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation project(':orbotservice') -- implementation 'com.android.support:design:27.1.1' -+ // Match Fennec's ANDROID_SUPPORT_LIBRARY_VERSION -+ implementation 'com.android.support:design:23.4.0' - implementation 'pl.bclogic:pulsator4droid:1.0.3' -- implementation 'com.github.apl-devs:appintro:v4.2.2' -- implementation 'com.github.javiersantos:AppUpdater:2.6.4' -+ // These require higher versions of ANDROID_SUPPORT_LIBRARY_VERSION -+ //implementation 'com.github.apl-devs:appintro:v4.2.2' -+ //implementation 'com.github.javiersantos:AppUpdater:2.6.4' - - } -diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml -index 56db8266..2cd00888 100644 ---- a/app/src/main/AndroidManifest.xml -+++ b/app/src/main/AndroidManifest.xml -@@ -15,15 +15,13 @@ - <uses-feature android:name="android.hardware.touchscreen" - android:required="false" /> - -+  -+  - <application -- android:name=".OrbotApp" - android:allowBackup="false" - android:allowClearUserData="true" - android:configChanges="locale|orientation|screenSize" - android:description="@string/app_description" -- android:hardwareAccelerated="false" -- android:icon="@drawable/ic_launcher" -- android:label="@string/app_name" - android:theme="@style/DefaultTheme" - tools:replace="android:allowBackup" - > -@@ -31,10 +29,10 @@ - android:name=".OrbotMainActivity" - android:excludeFromRecents="true" - android:launchMode="singleTop"> -+  - <intent-filter> - <action android:name="android.intent.action.MAIN" /> -- -- <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> -@@ -57,17 +55,20 @@ - </activity> - -  -+  - <activity - android:name=".service.util.DummyActivity" - android:allowTaskReparenting="true" - android:alwaysRetainTaskState="false" - android:clearTaskOnLaunch="true" -- android:enabled="true" -+ android:enabled="false" - android:excludeFromRecents="true" - android:finishOnTaskLaunch="true" - android:noHistory="true" - android:stateNotNeeded="true" - android:theme="@android:style/Theme.Translucent" /> -+  - <activity - android:name=".vpn.VPNEnableActivity" - android:exported="false" -@@ -85,26 +86,29 @@ - android:enabled="true" - android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false"></service> -+  - <service - android:name=".service.vpn.TorVpnService" -- android:enabled="true" -+ android:enabled="false" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService" /> - </intent-filter> - </service> - -+  - <receiver - android:name=".service.StartTorReceiver" -- android:exported="true"> -+ android:exported="false"> - <intent-filter> - <action android:name="org.torproject.android.intent.action.START" /> - </intent-filter> - </receiver> -+  - <receiver - android:name=".OnBootReceiver" -- android:enabled="true" -- android:exported="true"> -+ android:enabled="false" -+ android:exported="false"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - -@@ -154,7 +158,9 @@ - android:value=".OrbotMainActivity" /> - </activity> - -- <activity android:name=".ui.onboarding.OnboardingActivity"/> -+  -+  - <activity android:name=".ui.onboarding.BridgeWizardActivity"/> - - <provider -@@ -163,4 +169,4 @@ - android:exported="false" /> - </application> - --</manifest> -\ No newline at end of file -+</manifest> -diff --git a/build.gradle b/build.gradle -index 553079b6..ce06f082 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -5,7 +5,8 @@ buildscript { - google() - } - dependencies { -- classpath 'com.android.tools.build:gradle:3.1.4' -+ // Match Fennec -+ classpath 'com.android.tools.build:gradle:3.0.1' - } - } - -diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle -index 7ac21e4e..8f173b5f 100644 ---- a/jsocksAndroid/build.gradle -+++ b/jsocksAndroid/build.gradle -@@ -1,12 +1,14 @@ - apply plugin: 'com.android.library' - - android { -- compileSdkVersion 27 -- buildToolsVersion '27.0.3' -+ // Match Fennec's version -+ compileSdkVersion 26 -+ buildToolsVersion '26.0.2' - - defaultConfig { - minSdkVersion 16 -- targetSdkVersion 27 -+ // Match Fennec's version -+ targetSdkVersion 26 - } - - buildTypes { -diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle -index fb9b6946..e95f76ac 100644 ---- a/orbotservice/build.gradle -+++ b/orbotservice/build.gradle -@@ -1,8 +1,9 @@ - apply plugin: 'com.android.library' - - android { -- compileSdkVersion 27 -- buildToolsVersion '27.0.3' -+ // Match Fennec's version -+ compileSdkVersion 26 -+ buildToolsVersion '26.0.2' - - sourceSets { - main { -@@ -12,7 +13,8 @@ android { - - defaultConfig { - minSdkVersion 16 -- targetSdkVersion 27 -+ // Match Fennec's version -+ targetSdkVersion 26 - versionCode 1 - versionName "1.0" - -@@ -28,7 +30,8 @@ android { - dependencies { - implementation project(':jsocksAndroid') - implementation 'org.torproject:tor-android-binary:0.3.4.9' -- implementation 'com.android.support:appcompat-v7:27.1.1' -+ // Match Fennec's version -+ implementation 'com.android.support:appcompat-v7:23.4.0' - implementation 'com.jrummyapps:android-shell:1.0.1' - implementation fileTree(dir: 'libs', include: ['.so']) - testImplementation 'junit:junit:4.12' --- -2.17.1 - diff --git a/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch b/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch deleted file mode 100644 index 98c01fc..0000000 --- a/projects/orbot/0002-Bug-28051-Exclude-the-AppUpdater.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4a5480df8f23ccc96af794a2194d6a6c33513dc7 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:34:52 +0000 -Subject: [PATCH 02/13] Bug 28051 - Exclude the AppUpdater - ---- - app/src/main/java/org/torproject/android/OrbotApp.java | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java -index 7279c8e2..291b0456 100644 ---- a/app/src/main/java/org/torproject/android/OrbotApp.java -+++ b/app/src/main/java/org/torproject/android/OrbotApp.java -@@ -18,10 +18,6 @@ import android.support.v4.app.NotificationCompat; - import android.util.Log; - import android.widget.RemoteViews; - --import com.github.javiersantos.appupdater.AppUpdater; --import com.github.javiersantos.appupdater.enums.Display; --import com.github.javiersantos.appupdater.enums.UpdateFrom; -- - import org.torproject.android.service.OrbotConstants; - import org.torproject.android.service.TorEventHandler; - import org.torproject.android.service.TorService; -@@ -49,11 +45,6 @@ public class OrbotApp extends Application implements OrbotConstants - - //Language.setFromPreference(this, "pref_default_locale"); - -- //check for updates via github, since it is unlikely to be blocked; notify the user of places where upgrades can be found -- new AppUpdater(this) -- .setUpdateFrom(UpdateFrom.JSON) -- .setUpdateJSON("https://raw.githubusercontent.com/n8fr8/orbot/master/update.json") -- .setDisplay(Display.NOTIFICATION).start(); - } - - @Override --- -2.17.1 - diff --git a/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch b/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch deleted file mode 100644 index 2683d65..0000000 --- a/projects/orbot/0003-Bug-28051-Delete-the-Onboarding-activity.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 1b6c2cf4b610787e17ad746f7a69f947f717b938 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:36:56 +0000 -Subject: [PATCH 03/13] Bug 28051 - Delete the Onboarding activity - -It depends on a library that depends on a newer version of -the Android Support Library ---- - .../torproject/android/OrbotMainActivity.java | 13 +- - .../ui/onboarding/OnboardingActivity.java | 147 ------------------ - 2 files changed, 1 insertion(+), 159 deletions(-) - delete mode 100644 app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java - -diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -index e18711b1..7ad979ff 100644 ---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java -+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -@@ -29,7 +29,6 @@ import org.torproject.android.settings.SettingsPreferences; - import org.torproject.android.ui.AppManagerActivity; - import org.torproject.android.ui.Rotate3dAnimation; - import org.torproject.android.ui.onboarding.BridgeWizardActivity; --import org.torproject.android.ui.onboarding.OnboardingActivity; - import org.torproject.android.ui.hiddenservices.ClientCookiesActivity; - import org.torproject.android.ui.hiddenservices.HiddenServicesActivity; - import org.torproject.android.ui.hiddenservices.backup.BackupUtils; -@@ -197,16 +196,6 @@ public class OrbotMainActivity extends AppCompatActivity - new IntentFilter(TorServiceConstants.LOCAL_ACTION_LOG)); - - boolean showFirstTime = mPrefs.getBoolean("connect_first_time", true); -- -- if (showFirstTime) -- { -- Editor pEdit = mPrefs.edit(); -- pEdit.putBoolean("connect_first_time", false); -- pEdit.commit(); -- startActivity(new Intent(this,OnboardingActivity.class)); -- } -- -- - } - - private void sendIntentToService(final String action) { -@@ -870,7 +859,7 @@ public class OrbotMainActivity extends AppCompatActivity - @Override - public void onClick(DialogInterface dialog, int which) { - -- startActivity(OnboardingActivity.getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME,OrbotMainActivity.this)); -+ dialog.cancel(); - - - } -diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java -deleted file mode 100644 -index a8bad692..00000000 ---- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java -+++ /dev/null -@@ -1,147 +0,0 @@ --package org.torproject.android.ui.onboarding; -- --import android.content.Context; --import android.content.Intent; --import android.content.pm.PackageManager; --import android.content.pm.ResolveInfo; --import android.net.Uri; --import android.os.Bundle; --import android.support.annotation.Nullable; --import android.support.v4.app.Fragment; --import android.text.TextUtils; --import android.util.Log; --import android.view.View; -- --import com.github.paolorotolo.appintro.AppIntro; -- --import org.torproject.android.R; --import org.torproject.android.settings.LocaleHelper; --import org.torproject.android.ui.AppManagerActivity; --import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; --import org.torproject.android.vpn.VPNEnableActivity; -- --import java.util.List; -- --public class OnboardingActivity extends AppIntro { -- -- @Override -- protected void onCreate(@Nullable Bundle savedInstanceState) { -- super.onCreate(savedInstanceState); -- -- // Instead of fragments, you can also use our default slide -- // Just set a title, description, background and image. AppIntro will do the rest. -- CustomSlideBigText welcome = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); -- welcome.setTitle(getString(R.string.hello)); -- welcome.setSubTitle(getString(R.string.welcome)); -- addSlide(welcome); -- -- CustomSlideBigText intro2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); -- intro2.setTitle(getString(R.string.browser_the_internet)); -- intro2.setSubTitle(getString(R.string.no_tracking)); -- addSlide(intro2); -- -- CustomSlideBigText cs2 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); -- cs2.setTitle(getString(R.string.bridges_sometimes)); -- cs2.showButton(getString(R.string.action_more), new View.OnClickListener() { -- @Override -- public void onClick(View v) { -- startActivity(new Intent(OnboardingActivity.this,BridgeWizardActivity.class)); -- } -- }); -- addSlide(cs2); -- -- if (PermissionManager.isLollipopOrHigher()) { -- -- CustomSlideBigText cs3 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text); -- cs3.setTitle(getString(R.string.vpn_setup)); -- cs3.setSubTitle(getString(R.string.vpn_setup_sub)); -- cs3.showButton(getString(R.string.action_vpn_choose), new View.OnClickListener() { -- @Override -- public void onClick(View v) { -- startActivity(new Intent(OnboardingActivity.this, VPNEnableActivity.class)); -- startActivityForResult(new Intent(OnboardingActivity.this, AppManagerActivity.class), 9999); -- -- } -- }); -- addSlide(cs3); -- -- } -- -- // OPTIONAL METHODS -- // Override bar/separator color. -- setBarColor(getResources().getColor(R.color.dark_purple)); -- setSeparatorColor(getResources().getColor(R.color.panel_background_main)); -- -- // Hide Skip/Done button. -- showSkipButton(false); -- setProgressButtonEnabled(true); -- } -- -- @Override -- public void onSkipPressed(Fragment currentFragment) { -- super.onSkipPressed(currentFragment); -- // Do something when users tap on Skip button. -- } -- -- @Override -- public void onDonePressed(Fragment currentFragment) { -- super.onDonePressed(currentFragment); -- // Do something when users tap on Done button. -- finish(); -- } -- -- @Override -- public void onSlideChanged(@Nullable Fragment oldFragment, @Nullable Fragment newFragment) { -- super.onSlideChanged(oldFragment, newFragment); -- // Do something when the slide changes. -- } -- -- -- @Override -- protected void attachBaseContext(Context base) { -- super.attachBaseContext(LocaleHelper.onAttach(base)); -- } -- -- public static boolean isAppInstalled(PackageManager pm, String packageName) { -- try { -- pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES); -- return true; -- } catch (PackageManager.NameNotFoundException e) { -- return false; -- } -- } -- -- public static Intent getInstallIntent(String packageName, Context context) { -- final Intent intent = new Intent(Intent.ACTION_VIEW); -- intent.setData(Uri.parse(MARKET_URI + packageName)); -- -- PackageManager pm = context.getPackageManager(); -- List<ResolveInfo> resInfos = pm.queryIntentActivities(intent, 0); -- -- String foundPackageName = null; -- for (ResolveInfo r : resInfos) { -- Log.i("Install", "market: " + r.activityInfo.packageName); -- if (TextUtils.equals(r.activityInfo.packageName, FDROID_PACKAGE_NAME) -- || TextUtils.equals(r.activityInfo.packageName, PLAY_PACKAGE_NAME)) { -- foundPackageName = r.activityInfo.packageName; -- break; -- } -- } -- -- if (foundPackageName == null) { -- intent.setData(Uri.parse(FDROID_APP_URI + packageName)); -- } else { -- intent.setPackage(foundPackageName); -- } -- return intent; -- } -- -- final static String MARKET_URI = "market://details?id="; -- final static String FDROID_APP_URI = "https://f-droid.org/repository/browse/?fdid="; -- final static String PLAY_APP_URI = "https://play.google.com/store/apps/details?id="; -- final static String FDROID_URI = "https://f-droid.org/repository/browse/?fdfilter=info.guardianproject"; -- final static String PLAY_URI = "https://play.google.com/store/apps/developer?id=The+Guardian+Project"; -- -- private final static String FDROID_PACKAGE_NAME = "org.fdroid.fdroid"; -- private final static String PLAY_PACKAGE_NAME = "com.android.vending"; --} -\ No newline at end of file --- -2.17.1 - diff --git a/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch b/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch deleted file mode 100644 index c2cfb1b..0000000 --- a/projects/orbot/0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch +++ /dev/null @@ -1,308 +0,0 @@ -From b8ce28e8487772deaa9655245c3b43055e32937d Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:40:57 +0000 -Subject: [PATCH 04/13] Bug 28051 - Rename the Hidden Service content provider - ---- - app/src/main/AndroidManifest.xml | 13 ++++++++----- - .../org/torproject/android/OrbotMainActivity.java | 2 +- - .../ui/hiddenservices/ClientCookiesActivity.java | 2 +- - .../ui/hiddenservices/HiddenServicesActivity.java | 2 +- - .../adapters/ClientCookiesAdapter.java | 2 +- - .../hiddenservices/adapters/OnionListAdapter.java | 2 +- - .../ui/hiddenservices/backup/BackupUtils.java | 4 ++-- - .../hiddenservices/dialogs/AddCookieDialog.java | 2 +- - .../dialogs/CookieDeleteDialog.java | 2 +- - .../ui/hiddenservices/dialogs/HSCookieDialog.java | 2 +- - .../ui/hiddenservices/dialogs/HSDataDialog.java | 2 +- - .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 2 +- - .../providers/CookieContentProvider.java | 4 ++-- - .../providers/HSContentProvider.java | 4 ++-- - app/src/minimalperm/AndroidManifest.xml | 15 +++++++++------ - .../torproject/android/service/TorService.java | 6 ++++-- - 16 files changed, 37 insertions(+), 29 deletions(-) - -diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml -index 2cd00888..3c6262c2 100644 ---- a/app/src/main/AndroidManifest.xml -+++ b/app/src/main/AndroidManifest.xml -@@ -135,13 +135,15 @@ - android:value=".OrbotMainActivity" /> - </activity> - -+  - <provider -- android:name=".ui.hiddenservices.providers.HSContentProvider" -- android:authorities="org.torproject.android.ui.hiddenservices.providers" -+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider" -+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers" - android:exported="false" /> - <provider - android:name="android.support.v4.content.FileProvider" -- android:authorities="org.torproject.android.ui.hiddenservices.storage" -+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.storage" - android:exported="false" - android:grantUriPermissions="true"> - <meta-data -@@ -163,9 +165,10 @@ -  - <activity android:name=".ui.onboarding.BridgeWizardActivity"/> - -+  - <provider -- android:name=".ui.hiddenservices.providers.CookieContentProvider" -- android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie" -+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider" -+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers.cookie" - android:exported="false" /> - </application> - -diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -index 7ad979ff..ff5dd120 100644 ---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java -+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -@@ -33,7 +33,7 @@ import org.torproject.android.ui.hiddenservices.ClientCookiesActivity; - import org.torproject.android.ui.hiddenservices.HiddenServicesActivity; - import org.torproject.android.ui.hiddenservices.backup.BackupUtils; - import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; --import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider; - import org.torproject.android.vpn.VPNEnableActivity; - - import android.annotation.SuppressLint; -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java -index e6939800..933915d0 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java -@@ -31,7 +31,7 @@ import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog; - import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog; - import org.torproject.android.ui.hiddenservices.dialogs.SelectCookieBackupDialog; - import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; --import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider; - - public class ClientCookiesActivity extends AppCompatActivity { - public final int WRITE_EXTERNAL_STORAGE_FROM_COOKIE_ACTIONBAR = 3; -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java -index d7c1f313..3e2d9c3c 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java -@@ -28,7 +28,7 @@ import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog; - import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog; - import org.torproject.android.ui.hiddenservices.dialogs.SelectHSBackupDialog; - import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; --import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider; - - public class HiddenServicesActivity extends AppCompatActivity { - public final int WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR = 1; -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java -index bbc317a6..670c108a 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/ClientCookiesAdapter.java -@@ -14,7 +14,7 @@ import android.widget.TextView; - import android.widget.Toast; - - import org.torproject.android.R; --import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider; - - public class ClientCookiesAdapter extends CursorAdapter { - private LayoutInflater cursorInflater; -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java -index 9824c773..0079bce3 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/adapters/OnionListAdapter.java -@@ -14,7 +14,7 @@ import android.widget.TextView; - import android.widget.Toast; - - import org.torproject.android.R; --import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider; - - public class OnionListAdapter extends CursorAdapter { - private LayoutInflater cursorInflater; -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java -index a4790dd8..06606039 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java -@@ -12,8 +12,8 @@ import org.json.JSONException; - import org.json.JSONObject; - import org.torproject.android.R; - import org.torproject.android.service.TorServiceConstants; --import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider; --import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider; - import org.torproject.android.ui.hiddenservices.storage.ExternalStorage; - - import java.io.File; -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java -index 75663648..d6e280db 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/AddCookieDialog.java -@@ -14,7 +14,7 @@ import android.widget.EditText; - import android.widget.Toast; - - import org.torproject.android.R; --import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider; - - public class AddCookieDialog extends DialogFragment { - -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java -index 60c4d8e3..fc183981 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/CookieDeleteDialog.java -@@ -10,7 +10,7 @@ import android.support.v4.app.DialogFragment; - import android.support.v7.app.AlertDialog; - - import org.torproject.android.R; --import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider; - - public class CookieDeleteDialog extends DialogFragment { - -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java -index 39c1b510..0ae7dae5 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSCookieDialog.java -@@ -18,7 +18,7 @@ import com.google.zxing.integration.android.IntentIntegrator; - import org.json.JSONException; - import org.json.JSONObject; - import org.torproject.android.R; --import org.torproject.android.ui.hiddenservices.providers.CookieContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider; - - public class HSCookieDialog extends DialogFragment { - -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java -index 98255604..bc1754b9 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDataDialog.java -@@ -15,7 +15,7 @@ import android.widget.EditText; - import android.widget.Toast; - - import org.torproject.android.R; --import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider; - - public class HSDataDialog extends DialogFragment { - -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java -index ac5df743..0a60f22b 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java -@@ -11,7 +11,7 @@ import android.support.v7.app.AlertDialog; - - import org.torproject.android.R; - import org.torproject.android.service.TorServiceConstants; --import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; -+import org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider; - - import java.io.File; - -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java -index f420a6d8..4a371933 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/CookieContentProvider.java -@@ -1,4 +1,4 @@ --package org.torproject.android.ui.hiddenservices.providers; -+package org.torproject.torbrowser.ui.hiddenservices.providers; - - import android.content.ContentProvider; - import android.content.ContentUris; -@@ -22,7 +22,7 @@ public class CookieContentProvider extends ContentProvider { - ClientCookie.AUTH_COOKIE_VALUE, - ClientCookie.ENABLED - }; -- private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers.cookie"; -+ private static final String AUTH = "org.torproject.torbrowser.ui.hiddenservices.providers.cookie"; - public static final Uri CONTENT_URI = - Uri.parse("content://" + AUTH + "/cookie"); - //UriMatcher -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java -index d7b558fd..be7d2de2 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/providers/HSContentProvider.java -@@ -1,4 +1,4 @@ --package org.torproject.android.ui.hiddenservices.providers; -+package org.torproject.torbrowser.ui.hiddenservices.providers; - - import android.content.ContentProvider; - import android.content.ContentUris; -@@ -27,7 +27,7 @@ public class HSContentProvider extends ContentProvider { - HiddenService.CREATED_BY_USER, - HiddenService.ENABLED - }; -- private static final String AUTH = "org.torproject.android.ui.hiddenservices.providers"; -+ private static final String AUTH = "org.torproject.torbrowser.ui.hiddenservices.providers"; - public static final Uri CONTENT_URI = - Uri.parse("content://" + AUTH + "/hs"); - //UriMatcher -diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml -index adf74209..fedadd9b 100644 ---- a/app/src/minimalperm/AndroidManifest.xml -+++ b/app/src/minimalperm/AndroidManifest.xml -@@ -122,8 +122,10 @@ - </intent-filter> - </receiver> - -+  - <activity -- android:name=".ui.hiddenservices.HiddenServicesActivity" -+ android:name="org.torproject.torbrowser.ui.hiddenservices.HiddenServicesActivity" - android:label="@string/title_activity_hidden_services" - android:theme="@style/DefaultTheme"> - <meta-data -@@ -132,12 +134,12 @@ - </activity> - - <provider -- android:name=".ui.hiddenservices.providers.HSContentProvider" -- android:authorities="org.torproject.android.ui.hiddenservices.providers" -+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.HSContentProvider" -+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers" - android:exported="false" /> - <provider - android:name="android.support.v4.content.FileProvider" -- android:authorities="org.torproject.android.ui.hiddenservices.storage" -+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.storage" - android:exported="false" - android:grantUriPermissions="true"> - <meta-data -@@ -154,9 +156,10 @@ - android:value=".OrbotMainActivity" /> - </activity> - -+  - <provider -- android:name=".ui.hiddenservices.providers.CookieContentProvider" -- android:authorities="org.torproject.android.ui.hiddenservices.providers.cookie" -+ android:name="org.torproject.torbrowser.ui.hiddenservices.providers.CookieContentProvider" -+ android:authorities="org.torproject.torbrowser.ui.hiddenservices.providers.cookie" - android:exported="false" /> - </application> - -diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -index fec88b1f..edd0e3d5 100644 ---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java -+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -@@ -138,8 +138,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - - private ArrayList<Bridge> alBridges = null; - -- private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers/hs"); -- private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.android.ui.hiddenservices.providers.cookie/cookie"); -+ // Modify the Content Provider name so it doesn't collide with Orbot (when Orbot is installed, too). -+ // TBA fails while starting when this happens -+ private static final Uri HS_CONTENT_URI = Uri.parse("content://org.torproject.torbrowser.ui.hiddenservices.providers/hs"); -+ private static final Uri COOKIE_CONTENT_URI = Uri.parse("content://org.torproject.torbrowser.ui.hiddenservices.providers.cookie/cookie"); - - public static final class HiddenService implements BaseColumns { - public static final String NAME = "name"; --- -2.17.1 - diff --git a/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch b/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch deleted file mode 100644 index 13aeeec..0000000 --- a/projects/orbot/0005-Bug-28051-Cast-the-layout-elements.patch +++ /dev/null @@ -1,81 +0,0 @@ -From f05130d2184702b5005ecabe5363225459f7df74 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:44:03 +0000 -Subject: [PATCH 05/13] Bug 28051 - Cast the layout elements - -This is now required since we are using an older Android support library - -23.4.0 instead of 27.1.1. The exact reason for this is not known. ---- - .../torproject/android/ui/AppManagerActivity.java | 4 ++-- - .../android/ui/onboarding/BridgeWizardActivity.java | 12 ++++++------ - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java -index 2f60a40c..5bdcd504 100644 ---- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java -@@ -58,8 +58,8 @@ public class AppManagerActivity extends AppCompatActivity implements OnClickList - this.setContentView(R.layout.layout_apps); - setTitle(R.string.apps_mode); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); -- listApps = findViewById(R.id.applistview); -- progressBar = findViewById(R.id.progressBar); -+ listApps = (GridView) findViewById(R.id.applistview); -+ progressBar = (ProgressBar) findViewById(R.id.progressBar); - } - - /* -diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java -index e03a8d2d..e047e58f 100644 ---- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java -@@ -34,16 +34,16 @@ public class BridgeWizardActivity extends AppCompatActivity { - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_bridge_wizard); -- Toolbar toolbar = findViewById(R.id.toolbar); -+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - -- tvStatus = findViewById(R.id.lbl_bridge_test_status); -+ tvStatus = (TextView) findViewById(R.id.lbl_bridge_test_status); - tvStatus.setVisibility(View.GONE); - - setTitle(getString(R.string.bridges)); - -- RadioButton btnDirect = findViewById(R.id.btnBridgesDirect); -+ RadioButton btnDirect = (RadioButton) findViewById(R.id.btnBridgesDirect); - btnDirect.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { -@@ -53,7 +53,7 @@ public class BridgeWizardActivity extends AppCompatActivity { - } - }); - -- RadioButton btnObfs4 = findViewById(R.id.btnBridgesObfs4); -+ RadioButton btnObfs4 = (RadioButton) findViewById(R.id.btnBridgesObfs4); - btnObfs4.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { -@@ -64,7 +64,7 @@ public class BridgeWizardActivity extends AppCompatActivity { - }); - - -- RadioButton btnMeek = findViewById(R.id.btnBridgesMeek); -+ RadioButton btnMeek = (RadioButton) findViewById(R.id.btnBridgesMeek); - btnMeek.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { -@@ -75,7 +75,7 @@ public class BridgeWizardActivity extends AppCompatActivity { - }); - - -- RadioButton btnNew = findViewById(R.id.btnBridgesNew); -+ RadioButton btnNew = (RadioButton) findViewById(R.id.btnBridgesNew); - btnNew.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { --- -2.17.1 - diff --git a/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch b/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch deleted file mode 100644 index cfd5a1c..0000000 --- a/projects/orbot/0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 4b33256dc2f3f626cca70880069a94074e312132 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:46:49 +0000 -Subject: [PATCH 06/13] Bug 28051 - Don't use Orbot's LocaleHelper for locale - selection - ---- - .../main/java/org/torproject/android/OrbotMainActivity.java | 6 ------ - .../torproject/android/settings/SettingsPreferences.java | 5 ----- - .../android/ui/hiddenservices/ClientCookiesActivity.java | 6 ------ - .../android/ui/hiddenservices/HiddenServicesActivity.java | 6 ------ - .../android/ui/onboarding/BridgeWizardActivity.java | 6 ------ - 5 files changed, 29 deletions(-) - -diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -index ff5dd120..044b957f 100644 ---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java -+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -@@ -24,7 +24,6 @@ import org.torproject.android.service.TorService; - import org.torproject.android.service.TorServiceConstants; - import org.torproject.android.service.util.TorServiceUtils; - import org.torproject.android.settings.Languages; --import org.torproject.android.settings.LocaleHelper; - import org.torproject.android.settings.SettingsPreferences; - import org.torproject.android.ui.AppManagerActivity; - import org.torproject.android.ui.Rotate3dAnimation; -@@ -427,11 +426,6 @@ public class OrbotMainActivity extends AppCompatActivity - } - } - -- @Override -- protected void attachBaseContext(Context base) { -- super.attachBaseContext(LocaleHelper.onAttach(base)); -- } -- - /* - * Create the UI Options Menu (non-Javadoc) - * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) -diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java -index c3b5189d..df85a9f6 100644 ---- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java -+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java -@@ -47,11 +47,6 @@ public class SettingsPreferences - }); - } - -- @Override -- protected void attachBaseContext(Context base) { -- super.attachBaseContext(LocaleHelper.onAttach(base)); -- } -- - @Override - protected void onPause() { - //Language.setFromPreference(this, "pref_default_locale", true); -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java -index 933915d0..dd3a54e0 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/ClientCookiesActivity.java -@@ -25,7 +25,6 @@ import com.google.zxing.integration.android.IntentResult; - import org.json.JSONException; - import org.json.JSONObject; - import org.torproject.android.R; --import org.torproject.android.settings.LocaleHelper; - import org.torproject.android.ui.hiddenservices.adapters.ClientCookiesAdapter; - import org.torproject.android.ui.hiddenservices.dialogs.AddCookieDialog; - import org.torproject.android.ui.hiddenservices.dialogs.CookieActionsDialog; -@@ -103,11 +102,6 @@ public class ClientCookiesActivity extends AppCompatActivity { - } - - -- @Override -- protected void attachBaseContext(Context base) { -- super.attachBaseContext(LocaleHelper.onAttach(base)); -- } -- - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.cookie_menu, menu); -diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java -index 3e2d9c3c..75aefd14 100644 ---- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java -@@ -22,7 +22,6 @@ import android.widget.Spinner; - import android.widget.Toast; - - import org.torproject.android.R; --import org.torproject.android.settings.LocaleHelper; - import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter; - import org.torproject.android.ui.hiddenservices.dialogs.HSActionsDialog; - import org.torproject.android.ui.hiddenservices.dialogs.HSDataDialog; -@@ -108,11 +107,6 @@ public class HiddenServicesActivity extends AppCompatActivity { - } - - -- @Override -- protected void attachBaseContext(Context base) { -- super.attachBaseContext(LocaleHelper.onAttach(base)); -- } -- - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.hs_menu, menu); -diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java -index e047e58f..47778a32 100644 ---- a/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java -+++ b/app/src/main/java/org/torproject/android/ui/onboarding/BridgeWizardActivity.java -@@ -19,7 +19,6 @@ import android.widget.TextView; - import org.torproject.android.R; - import org.torproject.android.service.OrbotConstants; - import org.torproject.android.service.util.Prefs; --import org.torproject.android.settings.LocaleHelper; - - import java.io.IOException; - import java.net.InetSocketAddress; -@@ -92,11 +91,6 @@ public class BridgeWizardActivity extends AppCompatActivity { - - } - -- @Override -- protected void attachBaseContext(Context base) { -- super.attachBaseContext(LocaleHelper.onAttach(base)); -- } -- - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == android.R.id.home) { --- -2.17.1 - diff --git a/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch b/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch deleted file mode 100644 index 97dbc48..0000000 --- a/projects/orbot/0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a700bbe8356b4ab0a56460018e82cff1ded66c0b Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:48:27 +0000 -Subject: [PATCH 07/13] Bug 28051 - Rename Orbot's preferences so they don't - conflict with Fennec's - ---- - .../org/torproject/android/settings/SettingsPreferences.java | 3 ++- - .../main/res/xml-fa/{preferences.xml => orbot_preferences.xml} | 0 - .../main/res/xml/{preferences.xml => orbot_preferences.xml} | 0 - docs/WALKTHROUGH | 2 +- - 4 files changed, 3 insertions(+), 2 deletions(-) - rename app/src/main/res/xml-fa/{preferences.xml => orbot_preferences.xml} (100%) - rename app/src/main/res/xml/{preferences.xml => orbot_preferences.xml} (100%) - -diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java -index df85a9f6..0e7edcd8 100644 ---- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java -+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java -@@ -24,7 +24,8 @@ public class SettingsPreferences - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - -- addPreferencesFromResource(R.xml.preferences); -+ // Rename preferences so it doesn't conflict with Fennec -+ addPreferencesFromResource(R.xml.orbot_preferences); - getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS); - - prefLocale = (ListPreference) findPreference("pref_default_locale"); -diff --git a/app/src/main/res/xml-fa/preferences.xml b/app/src/main/res/xml-fa/orbot_preferences.xml -similarity index 100% -rename from app/src/main/res/xml-fa/preferences.xml -rename to app/src/main/res/xml-fa/orbot_preferences.xml -diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/orbot_preferences.xml -similarity index 100% -rename from app/src/main/res/xml/preferences.xml -rename to app/src/main/res/xml/orbot_preferences.xml -diff --git a/docs/WALKTHROUGH b/docs/WALKTHROUGH -index 55a356b5..8e432b04 100644 ---- a/docs/WALKTHROUGH -+++ b/docs/WALKTHROUGH -@@ -30,7 +30,7 @@ - //for this type of non-time critical function you just want to happen in the background at some point soon-ish - - âââ SettingsPreferences.java -- // Settings activity that loads the res/xml/preferences.xml resource up -+ // Settings activity that loads the res/xml/orbot_preferences.xml resource up - // has some custom event handlng, onActivityResult callback result code's as well - // basically meant to tell Orbot activity if critical settings have been modified and whether - // those new settings should be applied (like iptables/transproxy changes) --- -2.17.1 - diff --git a/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch b/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch deleted file mode 100644 index 720fc90..0000000 --- a/projects/orbot/0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a99a14cefc17e50dc2eafb0c99760dd8e09aaabd Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:49:59 +0000 -Subject: [PATCH 08/13] Bug 28051 - Make TorService compatible with the support - libraries - ---- - .../org/torproject/android/service/TorService.java | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -index edd0e3d5..a12a97bd 100644 ---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java -+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -@@ -35,7 +35,10 @@ import android.os.Build; - import android.os.IBinder; - import android.os.RemoteException; - import android.provider.BaseColumns; --import android.support.annotation.RequiresApi; -+// Not available in 23.4.0 -+// https://developer.android.com/reference/android/support/annotation/Requires… -+//import android.support.annotation.RequiresApi; -+import android.annotation.TargetApi; - import android.support.v4.app.NotificationCompat; - import android.support.v4.content.LocalBroadcastManager; - import android.text.TextUtils; -@@ -250,7 +253,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - - private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1"; - -- @RequiresApi(api = Build.VERSION_CODES.O) -+ // Use TargetApi until we use a support library version that adds the -+ // RequriesApi annotation -+ //@RequiresApi(api = Build.VERSION_CODES.O) -+ @TargetApi(value = Build.VERSION_CODES.O) - private void createNotificationChannel () - { - NotificationManager mNotificationManager = -@@ -300,7 +306,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - - mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE); - -- mNotifyBuilder.setChannelId(NOTIFICATION_CHANNEL_ID); - - - Intent intentRefresh = new Intent(); --- -2.17.1 - diff --git a/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch b/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch deleted file mode 100644 index c46304f..0000000 --- a/projects/orbot/0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch +++ /dev/null @@ -1,150 +0,0 @@ -From e9d07a68a445b644106780a4759cf41657762c91 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:52:26 +0000 -Subject: [PATCH 09/13] Bug 28051 - Change Orbot's behavior for Tor Browser - ---- - .../torproject/android/OrbotMainActivity.java | 10 +++++++++- - app/src/main/res/menu/orbot_main.xml | 2 +- - .../torproject/android/service/TorService.java | 17 ++++++++++++----- - .../android/service/TorServiceConstants.java | 11 ++++++----- - 4 files changed, 28 insertions(+), 12 deletions(-) - -diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -index 044b957f..e011817e 100644 ---- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java -+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java -@@ -552,7 +552,9 @@ public class OrbotMainActivity extends AppCompatActivity - * still exists - **/ - private void doExit() { -- stopTor(); -+ // Don't stop Tor when we exit Orbot. Let Fennec take care of -+ // that when we really exit the app. -+ //stopTor(); - - // Kill all the wizard activities - setResult(RESULT_CLOSE_ALL); -@@ -1122,6 +1124,11 @@ public class OrbotMainActivity extends AppCompatActivity - - mTxtOrbotLog.append(torServiceMsg + '\n'); - -+ // Return to the browser when we reach 100% bootstrapped -+ if (torServiceMsg.contains(TorServiceConstants.TOR_CONTROL_PORT_MSG_BOOTSTRAP_DONE)) { -+ finish(); -+ } -+ - } - - if (torStatus == null || newTorStatus.equals(torStatus)) { -@@ -1384,6 +1391,7 @@ public class OrbotMainActivity extends AppCompatActivity - iv.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { -+ // This should never be false, because we are the browser now. - if (!appInstalledOrNot(TorServiceConstants.BROWSER_APP_USERNAME)) - promptInstallOrfox(); - else -diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml -index cb25b9e0..1231da8e 100644 ---- a/app/src/main/res/menu/orbot_main.xml -+++ b/app/src/main/res/menu/orbot_main.xml -@@ -87,7 +87,7 @@ - /> - - <item android:id="@+id/menu_exit" -- android:title="@string/menu_exit" -+ android:title="@string/button_close" - android:icon="@drawable/ic_menu_exit" - yourapp:showAsAction="never" - -diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -index a12a97bd..189ee6ab 100644 ---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java -+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -@@ -285,6 +285,10 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - //Reusable code. - PackageManager pm = getPackageManager(); - Intent intent = pm.getLaunchIntentForPackage(getPackageName()); -+ // Add these so Fennec's LauncherActivity can correctly route the request -+ // to Orbot when the user taps the Notification -+ intent.setAction(TorServiceConstants.TOR_APP_USERNAME); -+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - - if (mNotifyBuilder == null) -@@ -413,9 +417,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - @Override - public void onTaskRemoved(Intent rootIntent){ - Log.d(OrbotConstants.TAG,"task removed"); -- Intent intent = new Intent( this, DummyActivity.class ); -- intent.addFlags( Intent.FLAG_ACTIVITY_NEW_TASK ); -- startActivity( intent ); -+ // Don't prevent being killed. If the user swiped away the -+ // app, then we should die. -+ stopTor(); - } - - @Override -@@ -656,12 +660,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - } - - extraLines.append("SOCKSPort ").append(socksPortPref).append(isolate).append('\n'); -- extraLines.append("SafeSocks 0").append('\n'); -+ // We don't want this disabled. -+ //extraLines.append("SafeSocks 0").append('\n'); - extraLines.append("TestSocks 0").append('\n'); - if (Prefs.openProxyOnAllInterfaces()) - extraLines.append("SocksListenAddress 0.0.0.0").append('\n'); - -- extraLines.append("HTTPTunnelPort ").append(mPortHTTP).append(isolate).append('\n'); -+ // We don't want/need this either -+ //extraLines.append("HTTPTunnelPort ").append(mPortHTTP).append(isolate).append('\n'); - - - if(prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false)) -@@ -869,6 +875,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - - String torCmdString = fileTor.getCanonicalPath() - + " DataDirectory " + appCacheHome.getCanonicalPath() -+ + " SocksPort " + TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT - + " --defaults-torrc " + torrcPath - + " -f " + torrcPath + ".custom"; - -diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java -index 4b62a6a8..44743156 100644 ---- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java -+++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java -@@ -8,7 +8,7 @@ import android.content.Intent; - public interface TorServiceConstants { - - String TOR_APP_USERNAME = "org.torproject.android"; -- String BROWSER_APP_USERNAME = "info.guardianproject.orfox"; -+ String BROWSER_APP_USERNAME = "org.torproject.torbrowser_alpha"; - - String DIRECTORY_TOR_BINARY = "bin"; - String DIRECTORY_TOR_DATA = "data"; -@@ -52,15 +52,16 @@ public interface TorServiceConstants { - - String IP_LOCALHOST = "127.0.0.1"; - int UPDATE_TIMEOUT = 1000; -- int TOR_TRANSPROXY_PORT_DEFAULT = 9040; -+ int TOR_TRANSPROXY_PORT_DEFAULT = 9140; - - int STANDARD_DNS_PORT = 53; - int TOR_DNS_PORT_DEFAULT = 5400; - String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1"; - -- int CONTROL_PORT_DEFAULT = 9051; -- int HTTP_PROXY_PORT_DEFAULT = 8118; // like Privoxy! -- int SOCKS_PROXY_PORT_DEFAULT = 9050; -+ // Not used, but we'll change this for consistency -+ int CONTROL_PORT_DEFAULT = 9151; -+ int HTTP_PROXY_PORT_DEFAULT = 8218; // like Privoxy! -+ int SOCKS_PROXY_PORT_DEFAULT = 9150; - - - //path to check Tor against --- -2.17.1 - diff --git a/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch b/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch deleted file mode 100644 index c65e7da..0000000 --- a/projects/orbot/0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch +++ /dev/null @@ -1,1532 +0,0 @@ -From d8e44193ca75fe1317b2fdd178fa26657bb50422 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:55:12 +0000 -Subject: [PATCH 10/13] Bug 28051 - Rename Orbot as Tor Browser - ---- - app/src/main/res/values-ay/strings.xml | 2 +- - app/src/main/res/values-az/strings.xml | 2 +- - app/src/main/res/values-ca/strings.xml | 2 +- - app/src/main/res/values-cs-rCZ/strings.xml | 2 +- - app/src/main/res/values-cs/strings.xml | 2 +- - app/src/main/res/values-cy/strings.xml | 2 +- - app/src/main/res/values-da/strings.xml | 2 +- - app/src/main/res/values-de/strings.xml | 2 +- - app/src/main/res/values-el/strings.xml | 2 +- - app/src/main/res/values-en-rGB/strings.xml | 2 +- - app/src/main/res/values-eo/strings.xml | 2 +- - app/src/main/res/values-es-rAR/strings.xml | 2 +- - app/src/main/res/values-es/strings.xml | 2 +- - app/src/main/res/values-et/strings.xml | 2 +- - app/src/main/res/values-eu/strings.xml | 2 +- - app/src/main/res/values-fi/strings.xml | 2 +- - app/src/main/res/values-fr-rFR/strings.xml | 2 +- - app/src/main/res/values-fr/strings.xml | 2 +- - app/src/main/res/values-gl/strings.xml | 2 +- - app/src/main/res/values-he/strings.xml | 2 +- - app/src/main/res/values-hr/strings.xml | 2 +- - app/src/main/res/values-hu/strings.xml | 2 +- - app/src/main/res/values-hy-rAM/strings.xml | 2 +- - app/src/main/res/values-id/strings.xml | 2 +- - app/src/main/res/values-in-rID/strings.xml | 2 +- - app/src/main/res/values-in/strings.xml | 2 +- - app/src/main/res/values-is/strings.xml | 2 +- - app/src/main/res/values-it/strings.xml | 2 +- - app/src/main/res/values-iw/strings.xml | 2 +- - app/src/main/res/values-ja/strings.xml | 2 +- - app/src/main/res/values-ko/strings.xml | 2 +- - app/src/main/res/values-lt/strings.xml | 2 +- - app/src/main/res/values-lv/strings.xml | 2 +- - app/src/main/res/values-mk/strings.xml | 2 +- - app/src/main/res/values-mr-rIN/strings.xml | 2 +- - app/src/main/res/values-ms-rMY/strings.xml | 2 +- - app/src/main/res/values-ms/strings.xml | 2 +- - app/src/main/res/values-nb/strings.xml | 2 +- - app/src/main/res/values-nl/strings.xml | 2 +- - app/src/main/res/values-pl/strings.xml | 2 +- - app/src/main/res/values-pt-rBR/strings.xml | 2 +- - app/src/main/res/values-pt-rPT/strings.xml | 2 +- - app/src/main/res/values-pt/strings.xml | 2 +- - app/src/main/res/values-ro/strings.xml | 2 +- - app/src/main/res/values-rs-rAR/strings.xml | 2 +- - app/src/main/res/values-ru/strings.xml | 2 +- - app/src/main/res/values-si-rLK/strings.xml | 2 +- - app/src/main/res/values-sk/strings.xml | 2 +- - app/src/main/res/values-sl/strings.xml | 2 +- - app/src/main/res/values-sn/strings.xml | 2 +- - app/src/main/res/values-sq/strings.xml | 2 +- - app/src/main/res/values-sv/strings.xml | 2 +- - app/src/main/res/values-th/strings.xml | 2 +- - app/src/main/res/values-tl/strings.xml | 2 +- - app/src/main/res/values-tr/strings.xml | 2 +- - app/src/main/res/values-uk/strings.xml | 2 +- - app/src/main/res/values-uz/strings.xml | 2 +- - app/src/main/res/values-vi/strings.xml | 2 +- - app/src/main/res/values-zh-rCN/strings.xml | 2 +- - app/src/main/res/values-zh-rTW/strings.xml | 2 +- - app/src/main/res/values/strings.xml | 2 +- - orbotservice/src/main/res/values-az/strings.xml | 2 +- - orbotservice/src/main/res/values-ca/strings.xml | 2 +- - orbotservice/src/main/res/values-cs-rCZ/strings.xml | 2 +- - orbotservice/src/main/res/values-cs/strings.xml | 2 +- - orbotservice/src/main/res/values-cy/strings.xml | 2 +- - orbotservice/src/main/res/values-da/strings.xml | 2 +- - orbotservice/src/main/res/values-de/strings.xml | 2 +- - orbotservice/src/main/res/values-el/strings.xml | 2 +- - orbotservice/src/main/res/values-eo/strings.xml | 2 +- - orbotservice/src/main/res/values-es-rAR/strings.xml | 2 +- - orbotservice/src/main/res/values-es/strings.xml | 2 +- - orbotservice/src/main/res/values-et/strings.xml | 2 +- - orbotservice/src/main/res/values-eu/strings.xml | 2 +- - orbotservice/src/main/res/values-fi/strings.xml | 2 +- - orbotservice/src/main/res/values-fr-rFR/strings.xml | 2 +- - orbotservice/src/main/res/values-fr/strings.xml | 2 +- - orbotservice/src/main/res/values-gl/strings.xml | 2 +- - orbotservice/src/main/res/values-he/strings.xml | 2 +- - orbotservice/src/main/res/values-hi/strings.xml | 2 +- - orbotservice/src/main/res/values-hr/strings.xml | 2 +- - orbotservice/src/main/res/values-hu/strings.xml | 2 +- - orbotservice/src/main/res/values-id/strings.xml | 2 +- - orbotservice/src/main/res/values-in-rID/strings.xml | 2 +- - orbotservice/src/main/res/values-in/strings.xml | 2 +- - orbotservice/src/main/res/values-is/strings.xml | 2 +- - orbotservice/src/main/res/values-it/strings.xml | 2 +- - orbotservice/src/main/res/values-iw/strings.xml | 2 +- - orbotservice/src/main/res/values-ja/strings.xml | 2 +- - orbotservice/src/main/res/values-ko/strings.xml | 2 +- - orbotservice/src/main/res/values-lv/strings.xml | 2 +- - orbotservice/src/main/res/values-mk/strings.xml | 2 +- - orbotservice/src/main/res/values-ms-rMY/strings.xml | 2 +- - orbotservice/src/main/res/values-ms/strings.xml | 2 +- - orbotservice/src/main/res/values-nb/strings.xml | 2 +- - orbotservice/src/main/res/values-nl/strings.xml | 2 +- - orbotservice/src/main/res/values-pl/strings.xml | 2 +- - orbotservice/src/main/res/values-pt-rBR/strings.xml | 2 +- - orbotservice/src/main/res/values-pt-rPT/strings.xml | 2 +- - orbotservice/src/main/res/values-pt/strings.xml | 2 +- - orbotservice/src/main/res/values-ro/strings.xml | 2 +- - orbotservice/src/main/res/values-rs-rAR/strings.xml | 2 +- - orbotservice/src/main/res/values-ru/strings.xml | 2 +- - orbotservice/src/main/res/values-si-rLK/strings.xml | 2 +- - orbotservice/src/main/res/values-sk/strings.xml | 2 +- - orbotservice/src/main/res/values-sl/strings.xml | 2 +- - orbotservice/src/main/res/values-sn/strings.xml | 2 +- - orbotservice/src/main/res/values-sv/strings.xml | 2 +- - orbotservice/src/main/res/values-th/strings.xml | 2 +- - orbotservice/src/main/res/values-tl/strings.xml | 2 +- - orbotservice/src/main/res/values-tr/strings.xml | 2 +- - orbotservice/src/main/res/values-uk/strings.xml | 2 +- - orbotservice/src/main/res/values-uz/strings.xml | 2 +- - orbotservice/src/main/res/values-vi/strings.xml | 2 +- - orbotservice/src/main/res/values-zh-rCN/strings.xml | 2 +- - orbotservice/src/main/res/values-zh-rTW/strings.xml | 2 +- - orbotservice/src/main/res/values/strings.xml | 2 +- - 117 files changed, 117 insertions(+), 117 deletions(-) - -diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml -index 12256d87..c61d039d 100644 ---- a/app/src/main/res/values-ay/strings.xml -+++ b/app/src/main/res/values-ay/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot </string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbotax proxyn mÃ€ wakichawipawa, llikatuq jan lunthatayasiÃ±atakiw yaqha wakichawinakampachar yanapi. Orbotax Toratuqiw uraqpachan luratanak jaÃ± uÃ±jayasiÃ±atak atamirinaktuq jark\'aqi. Torax Software Libre ukhamawa, ukampirus maynin luratanakapa, aruskipatanakapa, amuyunakap jan uÃ±jayasiÃ±atakiw jark\'aqi. </string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml -index de881840..5c449773 100644 ---- a/app/src/main/res/values-az/strings.xml -+++ b/app/src/main/res/values-az/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Pulsuz proksi tÉtbiqetmÉsi olan Orbot baÅqa tÉtbiqetmÉlÉrÉ internetdÉn daha tÉhlÃŒkÉsiz istifadÉ etmÉk imkanÄ± verir. Orbot sizin internet trafikinizi ÅifrÉlÉmÉk ÃŒÃ§ÃŒn Tordan istifadÉ edir vÉ dÃŒnyanÄ±n hÉr yerindÉ kompÃŒterlÉrin birindÉn o birinÉ sÄ±Ã§ramaqla bunu gizlÉdir. Tor pulsuz proqram tÉminatÄ±dÄ±r, eyni zamanda sizin ÅÉxsi azadlÄ±ÄÄ±nÄ±z vÉ tÉhlÃŒkÉsizliyinizÉ, gizli biznes fÉaliyyÉti vÉ ÉlaqÉlÉrÉ, o cÃŒmlÉdÉn trafik analiz adlanan dÃ¶vlÉt tÉhlÃŒkÉsizliyinÉ xÉlÉl gÉtirÉ bilÉcÉk ÅÉbÉkÉ nÉzarÉti formalarÄ±ndan mÃŒdafiÉ olunmaÄa yardÄ±m edÉn aÃ§Ä±q ÅÉbÉkÉdir.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml -index bac4cbad..c37f1399 100644 ---- a/app/src/main/res/values-ca/strings.xml -+++ b/app/src/main/res/values-ca/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">L\'Orbot Ã©s una aplicaciÃ³ de servidor intermediari gratuÃ¯ta que capacita a les altres aplicacions per utilitzar internet de forma mÃ©s segura. L\'Orbot utilitza Tor per xifrar les vostres comunicacions per Internet i ocultar-les fent-les saltar per una sÃšrie d\'ordinadors repartits per tot el mÃ³n. Tor Ã©s un programari lliure i una xarxa oberta que us ajuda a defensar-vos d\'un tipus de vigilÃ ncia a la xarxa que amenaÃ§a la llibertat personal i la privadesa, activitats empresarials i relacions confidencials i la seguretat en general, coneguda com anÃ lisi de trÃ nsit.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml -index 06712165..cb278203 100644 ---- a/app/src/main/res/values-cs-rCZ/strings.xml -+++ b/app/src/main/res/values-cs-rCZ/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot je bezplatnÃœ proxy server, kterÃœ umoÅŸÅuje bezpeÄnÄjÅ¡Ã pouÅŸitÃ internetu v ostatnÃch apklikacÃch. Orbot pouÅŸÃvÃ¡ Tor pro Å¡ifrovÃ¡nÃ internetovÃ©ho provozu a skrÃœvÃ¡ se dÃky pÅedÃ¡vÃ¡nÃ provozu pÅes vÃce poÄÃtaÄÅ¯ po celÃ©m svÄtÄ. Tor je bezplatnÃœ software a otevÅenÃ¡ sÃÅ¥, kterÃ¡ vÃ¡m pomÃ¡hÃ¡ chrÃ¡nit se pÅed sledovÃ¡nÃm sÃtÄ, kterÃ© ohroÅŸuje osobnÃ svobodu, bezpeÄnost, dÅ¯vÄrnÃ© obchodnÃ aktivity a vztahy a pÅed stÃ¡tnÃm sledovÃ¡nÃm, oznaÄovanÃœm jako anylÃœza provozu.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml -index c9cbb2fb..7d759070 100644 ---- a/app/src/main/res/values-cs/strings.xml -+++ b/app/src/main/res/values-cs/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot je proxy aplikace zdarma, kterÃ¡ umoÅŸÅuje ostatnÃm aplikacÃm pouÅŸÃvat internet bezpeÄnÄji. PouÅŸÃvÃ¡ Tor pro zaÅ¡ifrovÃ¡nÃ pÅenÃ¡Å¡enÃœch dat a skrÃœvÃ¡ je pomocÃ skokÅ¯ pÅes sÃ©rii poÄÃtaÄÅ¯ po celÃ©m svÄtÄ. Tor je software zdarma a jeho otevÅenÃ¡ sÃÅ¥ pomÃ¡hÃ¡ v obranÄ proti sledovÃ¡nÃ, kterÃ© zasahuje do osobnÃ svobody a soukromÃ, dÅ¯vÄrnÃœch obchodnÃch komunikacÃ a vztahÅ¯ a proti stÃ¡tnÃ bezpeÄnosti zvanÃ© analÃœza internetovÃ©ho provozu.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml -index 25a6dd54..2a4652b3 100644 ---- a/app/src/main/res/values-cy/strings.xml -+++ b/app/src/main/res/values-cy/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml -index bf019372..20f46135 100644 ---- a/app/src/main/res/values-da/strings.xml -+++ b/app/src/main/res/values-da/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot er en gratis og Ã¥ben proxy-applikation, der gÃžr det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og Ã¥ben software, der kan hjÃŠlpe dig mod netvÃŠrksovervÃ¥gning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml -index c9b435da..d4451ac3 100644 ---- a/app/src/main/res/values-de/strings.xml -+++ b/app/src/main/res/values-de/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ist eine kostenlose Proxy-App, die es anderen Apps ermÃ¶glicht, das Internet sicherer zu nutzen. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlÃŒsseln und versteckt ihn dann, indem er durch eine Reihe von Computern auf der ganzen Welt springt. Tor ist freie Software und ein offenes Netzwerk, das Ihnen hilft, sich gegen eine Form der NetzwerkÃŒberwachung zu verteidigen, die persÃ¶nliche Freiheit und PrivatsphÃ€re, vertrauliche GeschÃ€ftsaktivitÃ€ten und Beziehungen sowie die staatliche Sicherheit, die als Verkehrsanalyse bezeichnet wird, bedroht.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml -index 12015e1c..8f84cbe3 100644 ---- a/app/src/main/res/values-el/strings.xml -+++ b/app/src/main/res/values-el/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Î€Î¿ Orbot ÎµÎ¯ÎœÎ±Î¹ ÎŒÎ¹Î± ÎŽÏÏÎµÎ¬Îœ ÎµÏÎ±ÏÎŒÎ¿Î³Î® ÎŒÎµÏÎ¿Î»Î¬Î²Î·ÏÎ·Ï ÏÎ¿Ï ÎµÏÎ¹ÏÏÎÏÎµÎ¹ ÏÎµ Î¬Î»Î»ÎµÏ ÎµÏÎ±ÏÎŒÎ¿Î³ÎÏ ÎœÎ± ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹Î¿ÏÎœ ÏÎ¿ ÎÎ¹Î±ÎŽÎ¯ÎºÏÏÎ¿ ÎŒÎµ ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ· Î±ÏÏÎ¬Î»ÎµÎ¹Î±. Î€Î¿ Orbot ÏÏÎ·ÏÎ¹ÎŒÎ¿ÏÎ¿Î¹ÎµÎ¯ ÏÎ¿Îœ Tor Î³Î¹Î± ÏÎ·Îœ ÎºÏÏÏÏÎ¿Î³ÏÎ¬ÏÎ·ÏÎ· ÏÎ·Ï ÎŽÎ¹Î±ÎŽÎ¹ÎºÏÏÎ±ÎºÎ®Ï ÏÎ±Ï ÎºÎ¯ÎœÎ·ÏÎ·Ï ÎºÎ±Î¹ ÏÏÎ· ÏÏÎœÎÏÎµÎ¹Î± ÏÎ·Îœ ÎºÏÏÎ²ÎµÎ¹ Î±ÎœÎ±ÏÎ·ÎŽÏÎœÏÎ±Ï ÎŒÎÏÏ ÎŒÎ¹Î±Ï ÏÎµÎ¹ÏÎ¬Ï ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÏÎœ ÏÎµ ÏÎ»Î¿ ÏÎ¿Îœ ÎºÏÏÎŒÎ¿. Î€Î¿ Tor ÎµÎ¯ÎœÎ±Î¹ ÎµÎ»ÎµÏÎžÎµÏÎ¿ Î»Î¿Î³Î¹ÏÎŒÎ¹ÎºÏ ÎºÎ±Î¹ ÎÎœÎ± Î±ÎœÎ¿Î¹ÏÏÏ ÎŽÎ¯ÎºÏÏÎ¿ ÏÎ¿Ï ÏÎ±Ï Î²Î¿Î·ÎžÎ¬ ÎœÎ± ÏÏÎ±ÎžÎµÎ¯ÏÎµ ÎµÎœÎ¬ÎœÏÎ¹Î± ÏÎµ ÎŒÎ¹Î± ÎŒÎ¿ÏÏÎ® ÎµÏÎ¹ÏÎ®ÏÎ·ÏÎ·Ï ÎŽÎ¹ÎºÏÏÎ¿Ï ÏÎ¿Ï Î±ÏÎµÎ¹Î»ÎµÎ¯ ÏÎ·Îœ ÏÏÎ¿ÏÏÏÎ¹ÎºÎ® ÎµÎ»ÎµÏÎžÎµÏÎ¯Î± ÎºÎ±Î¹ Î¹ÎŽÎ¹ÏÏÎ¹ÎºÏÏÎ·ÏÎ±, ÎµÎŒÏÎ¹ÏÏÎµÏÏÎ¹ÎºÎÏ ÎµÏÎ¹ÏÎµÎ¹ÏÎ·ÎŒÎ±ÏÎ¹ÎºÎÏ ÎŽÏÎ±ÏÏÎ·ÏÎ¹ÏÏÎ·ÏÎµÏ ÎºÎ±Î¹ ÏÏ ÎÏÎµÎ¹Ï, ÎºÎ±Î¹ ÏÎ·Îœ ÎºÏÎ±ÏÎ¹ÎºÎ® Î±ÏÏÎ¬Î»ÎµÎ¹Î± Î³ÎœÏÏÏÎ® ÏÏ traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml -index 839ff9c2..b3e4a0cc 100644 ---- a/app/src/main/res/values-en-rGB/strings.xml -+++ b/app/src/main/res/values-en-rGB/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the Internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml -index f66130f8..7c1e24d3 100644 ---- a/app/src/main/res/values-eo/strings.xml -+++ b/app/src/main/res/values-eo/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml -index 54fa6102..f3f7faff 100644 ---- a/app/src/main/res/values-es-rAR/strings.xml -+++ b/app/src/main/res/values-es-rAR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot es una aplicaciÃ³n de proxy gratuita que le permite a otras aplicaciones utilizar Internet de forma segura. Tor encripta tu trafico de Internet y lo oculta rebotandolo a travÃ©s de una serie de ordenadores alrededor del mundo. Tor es un software gratuito y una red abierta que te ayuda a defenderte contra una forma de vigilancia de red que amenaza la libertad personal y la privacidad, actividades confidenciales de negocios y relaciones, y la seguridad de estado conocida como anÃ¡lisis de trafico.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml -index bd0a8b83..f232ee7c 100644 ---- a/app/src/main/res/values-es/strings.xml -+++ b/app/src/main/res/values-es/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot es una aplicaciÃ³n libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma mÃ¡s segura. Orbot utiliza Tor para cifrar su trÃ¡fico de Internet, y luego lo oculta rebotÃ¡ndolo a travÃ©s de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como anÃ¡lisis de trÃ¡fico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">https://check.torproject.org/?lang=es</string> -diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml -index e9c7b46d..9f838a7f 100644 ---- a/app/src/main/res/values-et/strings.xml -+++ b/app/src/main/res/values-et/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot on vabalt kasutatav proxy rakendus, mis vÃµimaldab teistel rakendustel Interneti turvalisemat kasutust. Orbot krÃŒpteerib ja peidab teie Internetiliikluse Tor abil paljude maailma arvutite vahel pÃµrgatades. Tor on vaba tarkvara ja vaba vÃµrgustik mis aitab teil kaitsta oma privaatsust, vabadust, konfidentsiaalset Ã€ritegevust, suhteid ja riiklikku julgeolekut arvutivÃµrgus toimuva liikluse analÃŒÃŒsi eest.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string> -diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml -index 7f2240c0..0d556574 100644 ---- a/app/src/main/res/values-eu/strings.xml -+++ b/app/src/main/res/values-eu/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot proxy aplikazio aske bat da beste aplikazioei Interneten erabilera seguruago bat egitea ahalbidetzen diena. Orbot-ek Tor erabiltzen du zure Internet trafikoa zifratzeko eta mundu osoan barrena hainbat konputagailuetatik pasatuz ezkutatzeko. Tor software askea eta sare irekia da, askatasun eta pribatutasun pertsonala, aktibitate eta erlazio komertzial konfidentzialak erasotzen dituen sare analisi moten kontra eginez babesten zaituena.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml -index 06c54138..2f5b2e59 100644 ---- a/app/src/main/res/values-fi/strings.xml -+++ b/app/src/main/res/values-fi/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot on ilmainen vÃ€lityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden kÃ€yttÃ€Ã€ internetiÃ€ turvallisemmin. Orbot kÃ€yttÃ€Ã€ Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrÃ€ttÃ€mÃ€llÃ€ sitÃ€ usean tietokoneen kautta ympÃ€ri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttÃ€ uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekÃ€ suojaamaan salaisia liiketoimintoja ja -yhteyksiÃ€.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml -index 1851e1e1..b638ef52 100644 ---- a/app/src/main/res/values-fr-rFR/strings.xml -+++ b/app/src/main/res/values-fr-rFR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis dâutiliser Internet avec une sÃ©curitÃ© accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers dâordinateurs de par le monde. Tor est un logiciel libre et un rÃ©seau ouvert qui vous aide Ã vous dÃ©fendre contre une forme de surveillance rÃ©seau qui menace la libertÃ© personnelle et la protection des donnÃ©es personnelles, les activitÃ©s professionnelles confidentielles et les relations, et lâanalyse du trafic des gouvernements.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml -index 6c99890d..253a30ec 100644 ---- a/app/src/main/res/values-fr/strings.xml -+++ b/app/src/main/res/values-fr/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis dâutiliser Internet avec une sÃ©curitÃ© accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers dâordinateurs de par le monde. Tor est un logiciel libre et un rÃ©seau ouvert qui vous aide Ã vous dÃ©fendre contre une forme de surveillance rÃ©seau qui menace la libertÃ© personnelle et la protection des donnÃ©es personnelles, les activitÃ©s professionnelles confidentielles et les relations, et lâanalyse du trafic des gouvernements.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml -index 4570acc5..ad580a33 100644 ---- a/app/src/main/res/values-gl/strings.xml -+++ b/app/src/main/res/values-gl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã© unha aplicaciÃ³n de proxy libre que permite a outras aplicaciÃ³ns usar a internet dun xeito mÃ¡is seguro. Orbot usa Tor para encriptar o teu trÃ¡fico de internet ocultando e rebotÃ¡ndoo a travÃ©s dunha serie de ordenadores ao redor do mundo. Tor Ã© software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciÃ¡is de negocios e relaciÃ³ns, e estado de seguridade coÃ±ecido como anÃ¡lise de trÃ¡fico.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml -index f322afb3..55c2629f 100644 ---- a/app/src/main/res/values-he/strings.xml -+++ b/app/src/main/res/values-he/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ××× ×××©×× ××× ×× ×©× ××€××ÖŸ××× ×××¢×Š×× ×××©×××× ×××š×× ×××©×ª××© ×××× ××š× × ×××ª×š ×××××. Orbot ××©×ª××© ×-Tor ××× ×××Š×€×× ××ª ×ª×¢×××š×ª ×××× ××š× × ×©×× ××× ××¡×ª××š ×××ª× ××××Š×¢××ª ××§×€×Š× ××š× ×¡××š×ª ×××©××× ××š××× ××¢×××. Tor ××× ×ª××× × ××× ×××ª ××š×©×ª ×€×ª××× ××¢×××š×ª ×× ×××ª××× × ××€× × ×Š××š× ×©× ××¢×§× ××š×©×ª ×××××× ×¢× ×××š××ª ×××©××ª ××€×š××××ª, ×€×¢××××××ª ×¢×¡×§×××ª ××©××××ª, ×××××× ×××× × ×××××š ××©× × ××ª×× ×ª×¢×××š×.</string> - <string name="internal_web_url">http://orbot</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml -index 9a7b63cc..b7a0beef 100644 ---- a/app/src/main/res/values-hr/strings.xml -+++ b/app/src/main/res/values-hr/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot je besplatna proxy aplikacija koja omoguÄuje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju VaÅ¡eg Internet prometa, a zatim ga skriva Å¡aljuÄi ga kroz seriju raÄunala diljem svijeta. Tor je besplatan software i otvorena mreÅŸa koja pomaÅŸe u borbi protiv nadzora mreÅŸe koji ugroÅŸava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaÅŸe u borbi protiv analize prometa.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml -index 7ea880e4..bd1c3d28 100644 ---- a/app/src/main/res/values-hu/strings.xml -+++ b/app/src/main/res/values-hu/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Az Orbot egy ingyenes proxy alkalmazÃ¡s, ami kÃ©pessÃ© tesz alkalmazÃ¡sokat, hogy biztonsÃ¡gosabban hasznÃ¡lhassÃ¡k az internetet. Az Orbot Tor-t hasznÃ¡l, hogy titkosÃtsa az internetforgalmadat Ã©s elrejtse azÃ¡ltal, hogy pattogtatja szÃ¡mÃtÃ³gÃ©pek sorozatain keresztÃŒl a vilÃ¡g kÃ¶rÃŒl. A Tor ingyenes szoftver Ã©s nyitott hÃ¡lÃ³zat, ami segÃt megvÃ©deni a hÃ¡lÃ³zati felÃŒgyelettÅl, ami fenyegeti a szemÃ©lyi szabadsÃ¡got Ã©s magÃ¡nÃ©letet, a bizalmas cÃ©ges tevÃ©kenysÃ©geket Ã©s kapcsolatokat, Ã©s Ã¡llambiztonsÃ¡g cÃmÃ©n a forgalomelemzÃ©stÅl.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml -index 616e9d04..cbd348e8 100644 ---- a/app/src/main/res/values-hy-rAM/strings.xml -+++ b/app/src/main/res/values-hy-rAM/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="menu_about">ÕÕ¡ÕœÕ«Õ¶</string> - <string name="button_about">ÕÕ¡ÕœÕ«Õ¶</string> - <string name="menu_verify">ÕÕ¿ÕžÖÕ£Õ¥Õ¬</string> -diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml -index 9a9876cf..8e53eda5 100644 ---- a/app/src/main/res/values-id/strings.xml -+++ b/app/src/main/res/values-id/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml -index 8b99a0d9..a4d72620 100644 ---- a/app/src/main/res/values-in-rID/strings.xml -+++ b/app/src/main/res/values-in-rID/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet Anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan layanan terbuka, yang membantu Anda menghindari pengawasan jaringan yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisis traffic.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml -index 42c44612..01701557 100644 ---- a/app/src/main/res/values-in/strings.xml -+++ b/app/src/main/res/values-in/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml -index 134cab09..ef258dcb 100644 ---- a/app/src/main/res/values-is/strings.xml -+++ b/app/src/main/res/values-is/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot er frjÃ¡lst og Ã³keypis milliÃŸjÃ³nsforrit (proxy) sem gerir Ã¶Ã°rum forritum kleift aÃ° nota veraldarvefinn Ã¡ Ã¶ruggari hÃ¡tt. Orbot notar Tor til aÃ° dulkÃ³Ã°a umferÃ° ÃŸÃna Ã¡ netinu og felur hana svo meÃ° aÃ° hoppa Ã gegnum fjÃ¶lda tÃ¶lva um allan heim. Tor er frjÃ¡ls hugbÃºnaÃ°ur og opiÃ° net sem aÃ°stoÃ°ar ÃŸig viÃ° aÃ° verjast eftirliti Ã¡ netinu sem vinnur gegn frelsi einkalÃfsins og friÃ°helgi; vinnur gegn viÃ°kvÃŠmum viÃ°skiptamÃ¡lum og sambÃ¶ndum og ÃŸeirri tegund rÃkisÃ¶ryggis sem ÃŸekkt er sem umferÃ°argreining.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml -index 3d9f3f21..2743e6a9 100644 ---- a/app/src/main/res/values-it/strings.xml -+++ b/app/src/main/res/values-it/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ãš un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera piÃ¹ sicura. Orbot usa Tor per cifrare il traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor Ãš un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertÃ e privacy personale, attivitÃ commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml -index e5e33f9b..9245cdc2 100644 ---- a/app/src/main/res/values-iw/strings.xml -+++ b/app/src/main/res/values-iw/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ××× × ××€×××§×Š×××ª ×€×š××§×¡× ××× ×××ª ××××€×©×š×ª ×××€×××§×Š×××ª ×××š××ª ×××©×ª××© ×××× ××š× × ×××××. Orbot × ×¢××š×ª ×-Tor ××× ×××Š×€×× ××ª ×ª×¢×××š×ª ×××× ××š× × ×©×× ××××¡×××ª× ××××Š×¢××ª× × ××ª××× ××š× ××¡×€×š ×××©××× ××š××× ××¢×××. Tor ××× ×ª××× × ×××€×©××ª ××š×©×ª ×€×ª××× ×××¡×××¢×ª ×× ×××ª××× × ××€× × ×¡×××× ××¡××××× ×©× ×××Š×¢× × ××××š ×××¢×§× ×××š ×š×©×ª ×××× ××š× × ×××××××× ×¢× ××€×š××××ª, ××××š××ª ××××©××ª, ×€×¢××××××ª ×¢×¡×§×××ª ×××¢×š×××ª ×××¡×× ××©××××ª.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml -index a3226fcc..4d7d3c87 100644 ---- a/app/src/main/res/values-ja/strings.xml -+++ b/app/src/main/res/values-ja/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbotã¯ä»ã®ã¢ããªãã€ã³ã¿ãŒããããããå®åšã«äœ¿ãããšãå¯èœã«ããããªãŒã®ãããã·ã¢ããªã§ããOrbotã§ã¯ãTorãçšããŠããªãã®ç«¯æ«ã®ãã©ãã£ãã¯ãæå·åããäžçäžã®ã³ã³ãã¥ãŒã¿ãŒãäžç¶ããããšã§ããã®ãã©ãã£ãã¯ãé ããŸããTorã¯ããªãŒã®ãœãããŠã§ã¢ãšãªãŒãã³ãªãããã¯ãŒã¯ã§ããããŠãŒã¶ãŒã®èªç±ãšãã©ã€ãã·ãŒãèããç£èŠæŽ»åããæ©å¯ã®ããžãã¹æŽ»åãåœå®¶ã«ãããã©ãã£ãã¯åæããèº«ãå®ãããšãå©ããŠãããŸãã</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml -index b9336955..d9a362e9 100644 ---- a/app/src/main/res/values-ko/strings.xml -+++ b/app/src/main/res/values-ko/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbotì ë€ë¥ž ì±ìŽ ìží°ë·ì ë ìì íê² ìŽì©í ì ìëë¡ ëìì£Œë ë¬Žë£ íë¡ì ì±ìëë€. Orbotì Torë¥Œ ìŽì©íì¬ ì¬ë¬ë¶ì ìží°ë· ížëíœì ìížííê³ ì ìžê³ì ì°ê²°ë ì»Žíší°ë¥Œ ê±°ì³ì ìšê¹ëë€. Torë ë¬Žë£ ìíížìšìŽìŽë©Žì ê°ë°© ë€ížìí¬ë¡ì ì¬ë¬ë¶ì ê°ìžì ìì , ì¬ìí, ìë°í ì¬ì íë, êŽê³, êµê° ìë³Žë¥Œ ìííë ë€ížìí¬ ê°ììž ížëíœ ë¶ììŒë¡ë¶í° ë³Žíží©ëë€.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml -index 0b798a52..d9669e3c 100644 ---- a/app/src/main/res/values-lt/strings.xml -+++ b/app/src/main/res/values-lt/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot yra tarpinÄ (proxy) programÄlÄ, kuri leidÅŸia kitoms programÄlÄms naudotis internetu ÅŸymiai saugiau. Orbot naudoja Tor, taip uÅŸÅ¡ifruodama interneto srautÄ ir jÄ¯ paslepia Å¡okinÄdama tarp daugybÄs kompiuteriÅ³ adresÅ³ iÅ¡ viso pasaulio. Tor yra nemokama programa bei atviras tinklas, kuris leidÅŸia apsisaugoti nuo tinklo stebÄjimÅ³, kurie kelia grÄsmÄ asmeninei laisvei ir privatumui, konfidencialumui, taip leidÅŸianti iÅ¡vengti tinklo srauto analizavimo.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml -index 7c222d67..074506dd 100644 ---- a/app/src/main/res/values-lv/strings.xml -+++ b/app/src/main/res/values-lv/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespÄju citÄm lietotnÄm droÅ¡Äk lietot internetu. Orbot izmanto Tor, lai Å¡ifrÄtu JÅ«su interneta datplÅ«smu, tad to paslÄpj, pÄrsÅ«tot to caur daudziem datoriem visÄ pasaulÄ. Tor ir bezmaksas programmatÅ«ra un atvÄrts tÄ«kls, kas palÄ«dz Jums aizsargÄties pret tÄ«kla uzraudzÄ«bas veidu - datplÅ«smas analÄ«zi -, ar kuras palÄ«dzÄ«bu tiek apdraudÄta personiskÄ brÄ«vÄ«ba un privÄtums, konfidenciÄlas lietiÅ¡Ä·as darbÄ«bas un attiecÄ«bas, kÄ arÄ« valsts droÅ¡Ä«ba. </string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml -index e73b8a0e..5c1ac41b 100644 ---- a/app/src/main/res/values-mk/strings.xml -+++ b/app/src/main/res/values-mk/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ðµ ÑÐ»ÐŸÐ±ÐŸÐŽÐœÐ° Ð¿ÑÐŸÐºÑÐž Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÑÐ° ÐºÐŸÑÐ° ÐžÐŒ ÐŸÐ²ÐŸÐ·ÐŒÐŸÐ¶ÑÐ²Ð° ÐœÐ° ÐŽÑÑÐ³ÐžÑÐµ Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÐž ÐŽÐ° Ð³ÐŸ ÐºÐŸÑÐžÑÑÐ°Ñ ÐÐœÑÐµÑÐœÐµÑÐŸÑ Ð¿ÐŸÐ±ÐµÐ·Ð±ÐµÐŽÐœÐŸ. Orbot ÐºÐŸÑÐžÑÑÐž Tor Ð·Ð° ÐµÐœÐºÑÐžÐ¿ÑÐžÑÐ°ÑÐµ ÐœÐ° ÐžÐœÑÐµÑÐœÐµÑ ÑÐŸÐŸÐ±ÑÐ°ÑÐ°ÑÐŸÑ, Ð° Ð¿ÐŸÑÐŸÐ° Ð³ÐŸ ÑÐŸÐºÑÐžÐ²Ð° Ðž Ð³ÐŸ Ð¿ÐŸÑÑÐºÐŸÐºÐœÑÐ²Ð° Ð¿ÑÐµÐºÑ ÑÐµÑÐžÑÐ° ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÐž ÐœÐžÐ· ÑÐµÐ»ÐžÐŸÑ ÑÐ²ÐµÑ. Tor Ðµ ÑÐ»ÐŸÐ±ÐŸÐŽÐµÐœ ÑÐŸÑÑÐ²ÐµÑ Ðž ÐŸÑÐ²ÐŸÑÐµÐœÐ° ÐŒÑÐµÐ¶Ð° ÐºÐŸÑ Ð²Ðž Ð¿ÐŸÐŒÐ°Ð³Ð° ÐŽÐ° ÑÐµ ÐŸÐŽÐ±Ð°ÑÐœÐžÑÐµ ÐŸÐŽ ÑÐŸÑÐŒÐž ÐœÐ° ÐœÐ°ÐŽÐ·ÐŸÑ ÐœÐ° ÐŒÑÐµÐ¶Ð°ÑÐ° ÐºÐŸÑ ÐžÐŒ ÑÐµ Ð·Ð°ÐºÐ°ÐœÑÐ²Ð° ÐœÐ° Ð²Ð°ÑÐ°ÑÐ° Ð»ÐžÑÐœÐ° ÑÐ»ÐŸÐ±ÐŸÐŽÐ° Ðž Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑ, ÐŽÐŸÐ²ÐµÑÐ»ÐžÐ²ÐžÑÐµ ÐŽÐµÐ»ÐŸÐ²ÐœÐž Ð°ÐºÑÐžÐ²ÐœÐŸÑÑÐž Ðž ÐŸÐŽÐœÐŸÑÐž, Ðž ÐŽÑÐ¶Ð°Ð²ÐœÐ°ÑÐ° Ð±ÐµÐ·Ð±ÐµÐŽÐœÐŸÑÑ Ð¿ÐŸÐ·ÐœÐ°ÑÐ° ÐºÐ°ÐºÐŸ Ð°ÐœÐ°Ð»ÐžÐ·Ð° ÐœÐ° ÑÐŸÐŸÐ±ÑÐ°ÑÐ°ÑÐŸÑ.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml -index 3eb48141..a4022654 100644 ---- a/app/src/main/res/values-mr-rIN/strings.xml -+++ b/app/src/main/res/values-mr-rIN/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">à€à€°à¥à€¬à¥à€ à€à€ à€µà€¿à€šà€Ÿà€®à¥à€²à¥à€¯ à€ªà¥à€°à¥à€à¥à€žà¥ à€à¥à€ª à€à€¹à¥ à€à¥ à€à€€à€° à€à¥à€ªà¥à€žà€šà€Ÿ à€à€à€à€°à€šà¥à€à€à€Ÿ à€à€§à€¿à€ à€žà¥à€°à€à¥à€·à€¿à€€à€ªà€£à¥ à€µà€Ÿà€ªà€° à€à€°à€£à¥à€¯à€Ÿà€ž à€žà€à¥à€·à€® à€à€°à€€à¥. à€à€°à¥à€¬à¥à€ à€à€ªà€²à¥à€¯à€Ÿ à€à€à€à€°à€šà¥à€ à€°à€¹à€Šà€Ÿà€°à¥à€à¥ à€à€šà¥à€à¥à€°à€¿à€ªà¥à€ à€à€°à€£à¥à€¯à€Ÿà€žà€Ÿà€ à¥ à€à¥à€°à€à€Ÿ à€µà€Ÿà€ªà€° à€à€°à€€à¥ à€à€£à€¿ à€šà€à€€à€° à€à€à€à€°à€Ÿà€€à¥à€² à€žà€à€à€£à€à€Ÿà€à€à¥à€¯à€Ÿ à€®à€Ÿà€²à€¿à€à¥à€Šà¥à€µà€Ÿà€°à¥ à€à€¡à¥ à€®à€Ÿà€°à¥à€š à€²à€ªà€µà€€à¥. à€à¥à€° à€¹à€Ÿ à€à€ à€µà€¿à€šà€Ÿà€®à¥à€²à¥à€¯ à€žà¥à€«à¥à€à€µà¥à€à€° à€à€£à€¿ à€à€ à€à¥à€²à€Ÿ à€šà¥à€à€µà€°à¥à€ à€à€¹à¥ à€à¥ à€à€ªà€²à¥à€¯à€Ÿà€²à€Ÿ à€šà¥à€à€µà€°à¥à€ à€žà¥à€µà€€à€à€€à¥à€°à€€à€Ÿ à€à€£à€¿ à€à¥à€ªà€šà¥à€¯à€€à€Ÿ, à€à¥à€ªà€šà¥à€¯ à€µà¥à€¯à€µà€žà€Ÿà€¯ à€à¥à€°à€¿à€¯à€Ÿà€à€²à€Ÿà€ª à€à€£à€¿ à€šà€Ÿà€€à¥à€žà€à€¬à€à€§ à€à€£à€¿ à€°à€¹à€Šà€Ÿà€°à¥ à€µà€¿à€¶à¥à€²à¥à€·à€£à€Ÿà€ž à€®à¥à€¹à€£à¥à€š à€à€³à€à€²à¥à€¯à€Ÿ à€à€Ÿà€£à€Ÿà€°à¥à€¯à€Ÿ à€°à€Ÿà€à¥à€¯ à€žà¥à€°à€à¥à€·à¥à€ž à€§à€®à€à¥ à€Šà¥à€£à€Ÿà€°à¥à€¯à€Ÿ à€šà¥à€à€µà€°à¥à€ à€šà€¿à€°à¥à€à¥à€·à€£à€Ÿà€à¥ à€°à€à¥à€·à€£ à€à€°à€£à¥à€¯à€Ÿà€ž à€®à€Šà€€ à€à€°à€€à¥.</string> - <string name="wizard_title">Orbot</string> -  -diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml -index e929c97b..a454494f 100644 ---- a/app/src/main/res/values-ms-rMY/strings.xml -+++ b/app/src/main/res/values-ms-rMY/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml -index 3caddf4a..86003e19 100644 ---- a/app/src/main/res/values-ms/strings.xml -+++ b/app/src/main/res/values-ms/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml -index 2c644b43..ca1bd9ad 100644 ---- a/app/src/main/res/values-nb/strings.xml -+++ b/app/src/main/res/values-nb/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot er et friprog-mellomtjeningsprogram som gjÃžr det mulig for andre programmer Ã¥ bruke Internett sikrere. Orbot bruker Tor for Ã¥ kryptere din internettrafikk, og skjuler da din trafikk ved Ã¥ sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er fri programvare, og et Ã¥pent nettverk som hjelper deg Ã¥ forsvare deg mot en form for nettverksovervÃ¥king som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig snoking kjent som trafikkanalyse.</string> - <string name="internal_web_url">https://torproject.org</string> - <string name="default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml -index 939112d2..801bac8d 100644 ---- a/app/src/main/res/values-nl/strings.xml -+++ b/app/src/main/res/values-nl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot is een vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te versleutelen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht, genaamd \'verkeersanalyse\', die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid bedreigt.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org/?lang=nl</string> -diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml -index 192e8773..d38062e1 100644 ---- a/app/src/main/res/values-pl/strings.xml -+++ b/app/src/main/res/values-pl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot jest darmowÄ aplikacjÄ proxy ktÃ³ra wspomaga inne aplikacje do uÅŒywania internetu bezpiecznie. Orbot uÅŒywa Tora do szyfrowania Twojego ruchu internetowego i nastÄpnie przepuszczania go przez wiele innych komputereÃ³w pororzucanych na caÅym Åwiecie. Tor jest darmowym oprogramowaniem i otwartÄ sieciÄ ktÃ³ra pomaga Tobie w obronie przed monitoringiem sieci ktÃ³ra zagrarza osobistej wolnoÅci i prywatnoÅci, poufnym biznesowym aktywnoÅciom.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml -index 286feceb..c4e243f2 100644 ---- a/app/src/main/res/values-pt-rBR/strings.xml -+++ b/app/src/main/res/values-pt-rBR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã© um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais seguranÃ§a. Orbot usa o Tor para criptografar seu trÃ¡fego na internet e entÃ£o o esconde \"saltando\" entre uma sÃ©rie de computadores ao redor do mundo. Tor Ã© um software livre e de rede aberta que ajuda vocÃª a se defender de certas formas de vigilÃ¢ncia que ameaÃ§am privacidade e liberdade pessoais, atividades e relaÃ§Ãµes comerciais confidenciais e seguranÃ§a estatal conhecida como anÃ¡lise de trÃ¡fego.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml -index 25f6741d..e9fa7b75 100644 ---- a/app/src/main/res/values-pt-rPT/strings.xml -+++ b/app/src/main/res/values-pt-rPT/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã© uma app proxy gratuita que fortifica outras apps para utilizar a internet mais seguramente. Orbot usa Tor para encriptar o seu trÃ¡fego de Internet e ocultÃ¡-lo saltando entre uma sÃ©rie de computadores no mundo todo. Tor Ã© um software gratuito e uma rede aberta que ajuda-lhe a defender contra uma forma de rede de vigilÃ¢ncia que ameaÃ§a a liberdade pessoal e privacidade, actividades de negÃ³cios confidenciais e parentesco, e seguranÃ§a de estado conhecido como anÃ¡lise de trÃ¡fego. - - </string> -diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml -index fd97061c..a255b33a 100644 ---- a/app/src/main/res/values-pt/strings.xml -+++ b/app/src/main/res/values-pt/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml -index 81354f92..cad6f923 100644 ---- a/app/src/main/res/values-ro/strings.xml -+++ b/app/src/main/res/values-ro/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot este o aplicaÅ£ie gratuitÄ de proxy care permite altor aplicaÅ£ii sÄ foloseascÄ internetul Ã®n siguranÅ£Ä. Orbot foloseÅte Tor pentru a cripta traficul de internet dupÄ care Ã®l ascunde printr-o serie de calculatoare din Ã®ntreaga lume. Tor este un program gratuit si o reÅ£ea deschisÄ care te ajutÄ sÄ te aperi de monitorizarea reÅ£elelor, lucru care ameninÅ£Ä libertatea personalÄ Åi intimitatea, activitÄÅ£i confidenÅ£iale legate de afaceri si relaÅ£ii personale Åi de analiza traficului.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-rs-rAR/strings.xml b/app/src/main/res/values-rs-rAR/strings.xml -index 132b67e8..a368dfcb 100644 ---- a/app/src/main/res/values-rs-rAR/strings.xml -+++ b/app/src/main/res/values-rs-rAR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml -index 96b3d622..12dcbcf1 100644 ---- a/app/src/main/res/values-ru/strings.xml -+++ b/app/src/main/res/values-ru/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot â ÑÑÐŸ ÑÐ²ÐŸÐ±ÐŸÐŽÐœÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÐž-ÑÐŸÐµÐŽÐžÐœÐµÐœÐžÐ¹, ÐŸÐœÐ° Ð¿ÐŸÐ·Ð²ÐŸÐ»ÑÐµÑ ÐŽÑÑÐ³ÐžÐŒ Ð¿ÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÑÐŒ Ð±ÐŸÐ»ÐµÐµ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ ÐžÐœÑÐµÑÐœÐµÑ-ÑÐŸÐµÐŽÐžÐœÐµÐœÐžÐµ. Orbot ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÐŸÐ²Ð°ÐœÐžÑ ÐžÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÐžÐºÐ°, ÐºÐŸÑÐŸÑÑÐ¹ Ð·Ð°ÑÐµÐŒ ÑÐºÑÑÐ²Ð°ÐµÑÑÑ Ð² ÑÐŸÐŽÐµ Ð¿ÐµÑÐµÑÑÐ»ÐºÐž ÑÐµÑÐµÐ· ÐœÐµÑÐºÐŸÐ»ÑÐºÐŸ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÐŸÐ² Ð² ÑÐ°Ð·ÐœÑÑ ÑÐ°ÑÑÑÑ Ð¿Ð»Ð°ÐœÐµÑÑ. Tor ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ²ÐŸÐ±ÐŸÐŽÐœÑÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÑÐŒ Ð¿ÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÐµÐŒ, Ð° ÑÐ°ÐºÐ¶Ðµ ÐŸÑÐºÑÑÑÐŸÐ¹ ÑÐµÑÑÑ, Ð¿ÐŸÐŒÐŸÐ³Ð°ÑÑÐµÐ¹ Ð·Ð°ÑÐžÑÐžÑÑÑÑ ÐŸÑ ÑÐ»ÐµÐ¶ÐºÐž Ð² ÑÐµÑÑÑ, ÑÐ³ÑÐŸÐ¶Ð°ÑÑÐµÐ¹ Ð»ÐžÑÐœÐŸÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÐµ Ðž ÑÐ°ÑÑÐœÐŸÐ¹ Ð¶ÐžÐ·ÐœÐž, ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÐŸÑÑÐž Ð±ÐžÐ·ÐœÐµÑ-ÐŽÐµÑÑÐµÐ»ÑÐœÐŸÑÑÐž Ðž ÐºÐŸÐœÑÐ°ÐºÑÐŸÐ², Ð° ÑÐ°ÐºÐ¶Ðµ Ð³ÐŸÑÑÐŽÐ°ÑÑÑÐ²ÐµÐœÐœÐŸÐ¹ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ ŒÑ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÐž, ÐžÐ·Ð²ÐµÑÑÐœÐŸÐ¹ ÐºÐ°Ðº Ð°ÐœÐ°Ð»ÐžÐ· ÑÑÐ°ÑÐžÐºÐ°.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml -index fa3e5671..d898bba1 100644 ---- a/app/src/main/res/values-si-rLK/strings.xml -+++ b/app/src/main/res/values-si-rLK/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot à¶ºà¶±à· à¶à¶±à·à¶à·à¶à· à¶à·à¶Žà·à·à· à·à¶§ à·à¶©à· à¶à·à¶»à¶à·à·à·à¶à·à¶»à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œà·à¶ºà· à·à·à¶»à·à·à·à¶»à·à¶žà¶§ à¶à¶© à·à¶œà·à·à¶¯à·à¶± à¶±à·à·à¶žà·à¶œà·à· à¶œà¶¶à·à¶¯à·à¶±à·à¶±à·à·à· à¶Žà·à¶»à·à¶à·à·à· à·à·à·à·à·à·à¶à·. à¶à¶º Tor à¶ºà·à·à¶¯à·à¶à¶±à·à¶žà·à¶±à· à¶à¶¶à¶à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶±à·à¶¯à·à¶±à· à¶à·à·à¶à¶±à¶º à¶à¶»à¶ºà· à¶à¶žà·à¶±à·à¶ž à¶à¶º à¶œà·à·à· à·à¶§à· à·à· à¶à¶±à·à¶à·à¶à· à·à¶žà·à¶±à·à¶à¶» à¶Žà¶»à·à¶à¶±à¶ à·à¶»à·à· à¶à·à¶±à¶ºà¶žà·à¶±à· à¶à¶¶à¶à·à· à¶à¶±à·à¶à¶»à·à¶¢à·à¶œ à¶à¶±à·à¶¯à·à¶±à· à·à¶à·à· à¶à¶¶à·à¶à¶±à·. Tor à¶ºà¶±à· </string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml -index 478b7983..98793020 100644 ---- a/app/src/main/res/values-sk/strings.xml -+++ b/app/src/main/res/values-sk/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot je bezplatnÃ¡ proxy aplikÃ¡cia, ktorÃ¡ umoÅŸÅuje ostatnÃœm aplikÃ¡ciam pouÅŸÃvaÅ¥ internet bezpeÄnejÅ¡ie. Orbot pouÅŸÃva Tor pre Å¡ifrovanie vaÅ¡ej internetovej komunikÃ¡cie, ktorÃº nÃ¡sledne schovÃ¡ za sÃ©riu nÃ¡hodnÃœch poÄÃtaÄov z celÃ©ho sveta. Tor je bezplatnÃœ software a otvorenÃ¡ sieÅ¥, ktorÃ¡ pomÃ¡ha chrÃ¡niÅ¥ proti sledovaniu sietÃ, ktorÃ© ohrozuje osobnÃº slobodu a sÃºkromie, dÃŽvernÃ© pracovnÃ© aktivity a vzÅ¥ahy a tieÅŸ bezpeÄnosÅ¥ Å¡tÃ¡tov znÃ¡mu ako analÃœza prevÃ¡dzky.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml -index 5a8d2d42..84df0612 100644 ---- a/app/src/main/res/values-sl/strings.xml -+++ b/app/src/main/res/values-sl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org/?lang=sl</string> - <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string> -diff --git a/app/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml -index 08498df8..880f85cd 100644 ---- a/app/src/main/res/values-sn/strings.xml -+++ b/app/src/main/res/values-sn/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> - <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> -diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml -index 4765e738..a4ca3dc7 100644 ---- a/app/src/main/res/values-sq/strings.xml -+++ b/app/src/main/res/values-sq/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot eshte nje perfaqesues falas per internetin i cili ndihmon programet e tjera te perdori internetin ne menyre me te sigurte. Orbot perdor Tor per te shifruar trafikun tuaj te internetit nepermjet nje serie me kompjutere perqark botes. Tor eshte nje softwere pa pagese dhe nje rrjet i hapur qe ju ndihmon juve te mbroheni nga cdo forme mbikqyrjeje ne rrjet qe cenon lirine dhe privatesine personale, aktivitetet konfidenciale te lidhjeve dhe bizneseve, dhe siqurine e gjendjes te njohur si analiza e trafikut.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml -index 35275219..6f47c97b 100644 ---- a/app/src/main/res/values-sv/strings.xml -+++ b/app/src/main/res/values-sv/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã€r en gratis proxyapp som mÃ¶jliggÃ¶r andra appar att anvÃ€nda internet mer sÃ€kert. Orbot anvÃ€nder Tor fÃ¶r att kryptera din internettrafik och dÃ¶ljer den genom att den studsar genom ett antal datorer vÃ€rlden Ã¶ver. Tor Ã€r fri programvara och ett Ã¶ppet nÃ€tverk som hjÃ€lper dig att skydda dig mot en form av nÃ€tverksÃ¶vervakning som hotar personlig integritet och frihet, hemliga affÃ€rsaktiviteter och relationer, och skyddar mot statlig Ã¶vervakning Ã€ven kallad trafikanalys.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml -index 43ec54ad..a46ffd38 100644 ---- a/app/src/main/res/values-th/strings.xml -+++ b/app/src/main/res/values-th/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot àžàž·àžà¹àžàžàžàž£à¹àžàžàžàžµàžàž£àžµàžàžµà¹àžà¹àž§àž¢à¹àžàžŽà¹àž¡àžàž£àž°àžªàžŽàžàžàžŽàž àž²àžà¹àž«à¹àžàž±àžà¹àžàžàžàž·à¹àžà¹ à¹àž«à¹àžªàž²àž¡àž²àž£àžà¹àžà¹àžàž²àžàžàžŽàžà¹àžàžàž£à¹à¹àžà¹àžà¹àžà¹àžàž¢à¹àž²àžàžàž¥àžàžàž àž±àž¢àž¡àž²àžàžàž¶à¹àž Orbot à¹àžà¹ Tor à¹àžàžàž²àž£à¹àžà¹àž²àž£àž«àž±àžªàžàž²àž£àž£àž±àžàžªà¹àžàžà¹àžàž¡àž¹àž¥àžàž²àžàžàžŽàžà¹àžàžàž£à¹à¹àžà¹àžàžàžàžàžàžžàžà¹àž¥àž°àžàž³àžàž²àž£àžà¹àžàžàžà¹àžàž¡àž¹àž¥à¹àžàž¢àžàž²àž£àžªàž°àžà¹àžàžàžàž²àž£à¹àžàž·à¹àžàž¡àžà¹àžàžà¹àž²àžàžàž¥àžžà¹àž¡àžàžàžà¹àžàž£àž·à¹àžàžàžàžàž¡àžàžŽàž§à¹àžàžàž£à¹àžàž±à¹àž§à¹àž¥àž Tor à¹àžà¹àžàžàžàžàžà¹à¹àž§àž£à¹àžàž£àžµà¹àž¥àž°à¹àžà¹àžà¹àžàž£àž·àžàžà¹àž²àž¢à¹àžàžà¹àžàžŽàžàžàžµà¹àžà¹àž§àž¢àžàžàžà¹àžàžàžàžžàžàžàž²àžàžàž²àž£àžªàžàžàžªà¹àžàžà¹àžàž£àž·àžàžà¹àž²àž¢àžàžµà¹ àžàžžàžàžàž²àž¡àžàžŽàžªàž£àž àž²àžà¹àž¥àž°àžàž§àž²àž¡à¹àžà¹àžàžªà¹àž§àžàžàž±àž§àžàžàžàžàž¹à¹àžàž àž£àž±àžàž©àž²àžàž§àž²àž¡àž¥àž±àžàžàž²àžàžàžžàž£àžàžŽàžà¹àž¥àž°àžàž§àž²àž¡àžªàž±àž¡àžàž±àžàžà¹ à¹àž¥àž°àžàž²àž£àžªàž£à¹àž²àžàžàž§àž²àž¡àžàž¥àžàžàž àž±àž¢à¹àžàž¢àžàž²àž£àž§àžŽà¹àžàž£àž²àž°àž«à¹àžàž²àž£àž£àž±àžàžªà¹àžàžà¹àžàž¡àž¹àž¥</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml -index 92f605a1..2b922a13 100644 ---- a/app/src/main/res/values-tl/strings.xml -+++ b/app/src/main/res/values-tl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml -index c44cad3b..1ccef895 100644 ---- a/app/src/main/res/values-tr/strings.xml -+++ b/app/src/main/res/values-tr/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot baÅka uygulamalarÄ±n Ä°nterneti daha gÃŒvenli olarak kullanmasÄ±nÄ± saÄlayan ÃŒcretsiz bir vekil sunucu uygulamasÄ±dÄ±r. Orbot Tor yazÄ±lÄ±mÄ±nÄ± kullanarak Ä°nternet trafiÄinizi Åifreler ve dÃŒnya ÃŒzerindeki pek Ã§ok farklÄ± bilgisayardan geÃ§irerek gizler. Tor kiÅisel Ã¶zgÃŒrlÃŒÄÃŒnÃŒze, kiÅisel bilgilerinize, gizli ticari iÅlemlerinize ve iliÅkilerinize karÅÄ± tehdit oluÅturan ve devlet gÃŒvenliÄi olarak bilinen aÄ izlemelerine karÅÄ± koruma saÄlayan bir Ã¶zgÃŒr yazÄ±lÄ±m ve aÃ§Ä±k aÄ yazÄ±lÄ±mÄ±dÄ±r.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">https://check.torproject.org/?lang=tr</string> -diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml -index ba32ec23..c54f1549 100644 ---- a/app/src/main/res/values-uk/strings.xml -+++ b/app/src/main/res/values-uk/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot â ÑÐµ Ð²ÑÐ»ÑÐœÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ° ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑ-Ð·\'ÑÐŽÐœÐ°ÐœÑ, ÑÐºÐ° ÐŽÐŸÐ·Ð²ÐŸÐ»ÑÑ ÑÐœÑÐžÐŒ ÐŽÐŸÐŽÐ°ÑÐºÐ°ÐŒ Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐµ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž ÑÐœÑÐµÑÐœÐµÑ-Ð·\'ÑÐŽÐœÐ°ÐœÐœÑ. Orbot Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÑÐ²Ð°ÐœÐœÑ ÑÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÑÐºÑ, ÑÐºÐžÐ¹ ÐŽÐ°Ð»Ñ Ð¿ÑÐžÑÐŸÐ²ÑÑÑÑÑÑ Ð¿ÑÐŽ ÑÐ°Ñ Ð¿ÐµÑÐµÑÐžÐ»Ð°ÐœÐœÑ ÑÐµÑÐµÐ· ÐºÑÐ»ÑÐºÐ° ÐºÐŸÐŒÐ¿\'ÑÑÐµÑÑÐ² Ñ ÑÑÐ·ÐœÐžÑ ÑÐ°ÑÑÐžÐœÐ°Ñ Ð¿Ð»Ð°ÐœÐµÑÐž. Tor Ñ Ð²ÑÐ»ÑÐœÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐžÐŒ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ Ð²ÑÐŽÐºÑÐžÑÐŸÑ ÐŒÐµÑÐµÐ¶ÐµÑ, ÑÐŸ ÐŽÐŸÐ¿ÐŸÐŒÐ°Ð³Ð°Ñ Ð·Ð°ÑÐžÑÑÐžÑÐžÑÑ Ð²ÑÐŽ ÐŒÐµÑÐµÐ¶ÐµÐ²ÐŸÐ³ÐŸ ÑÑÐµÐ¶ÐµÐœÐœÑ, ÑÐºÐµ Ð·Ð°Ð³ÑÐŸÐ¶ÑÑ ÐŸÑÐŸÐ±ÐžÑÑÑÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÑ ÑÐ° Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÐŒÑ Ð¶ÐžÑÑÑ, ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÑÐ¹ Ð±ÑÐ·ÐœÐµÑ-ÐŽÑÑÐ»ÑÐœÐŸÑÑÑ Ñ ÐºÐŸÐœÑÐ°ÐºÑÐ°ÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ ÐŽÐµÑÐ¶Ð°Ð²ÐœÐŸÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐž Ð±ÐµÐ·Ð¿ÐµÐºÐž, ÑÐŸ Ð ²ÑÐŽÐŸÐŒÐ° ÑÐº Ð°ÐœÐ°Ð»ÑÐ· ÑÑÐ°ÑÑÐºÑ.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml -index ac5e479d..497cc900 100644 ---- a/app/src/main/res/values-uz/strings.xml -+++ b/app/src/main/res/values-uz/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml -index fd2b2133..f1684c2a 100644 ---- a/app/src/main/res/values-vi/strings.xml -+++ b/app/src/main/res/values-vi/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot lÃ má»t á»©ng dá»¥ng proxy miá»n phÃ, ÄÆ°á»£c thiáº¿t káº¿ Äá» lÃ m cho cÃ¡c á»©ng dá»¥ng khÃ¡c káº¿t ná»i vá»i Internet má»t cÃ¡ch an toÃ n. Orbot sá» dá»¥ng Tor Äá» mÃ£ hÃ³a cÃ¡c káº¿t ná»i Internet rá»i áº©n danh nÃ³ thÃŽng qua má»t loáº¡t cÃ¡c nÃºt trong máº¡ng Tor. Tor lÃ pháº§n má»m miá»n phÃ vÃ lÃ má»t máº¡ng lÆ°á»i má» giÃºp báº¡n chá»ng láº¡i sá»± giÃ¡m sÃ¡t máº¡ng, vá»n Äe dá»a riÃªng tÆ° trá»±c tuyáº¿n, hay cÃ¡c hoáº¡t Äá»ng bÃ máºt...</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml -index 5f2c7965..b69369e4 100644 ---- a/app/src/main/res/values-zh-rCN/strings.xml -+++ b/app/src/main/res/values-zh-rCN/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot æ¯äžæ¬ŸåèŽ¹çä»£çåºçšïŒèœå€è®©å¶ä»åºçšæŽå®åšå°äœ¿çšäºèçœãéè¿åšäœäºäžçåå°çäžç³»åè®¡ç®æºä¹éŽè¿è¡è·³èœ¬ïŒOrbot å¯å©çš Tor å¯¹çœç»éä¿¡è¿è¡å å¯å¹¶éèãTor æ¯äžæ¬ŸåèŽ¹çèœ¯ä»¶ïŒå¹¶äžæ¯äžäžªåŒæŸççœç»ãå®å¯ä»¥ä¿æ€çšæ·ååæµéåæçå±å®³ïŒè¿ç§çœç»çæ§å¯å¯¹äžªäººèªç±äžéç§ãåäžæºå¯æŽ»åšåå³ç³»ä»¥ååœå®¶å®åšé æåšèã</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml -index 0a7c4d03..b397bd71 100644 ---- a/app/src/main/res/values-zh-rTW/strings.xml -+++ b/app/src/main/res/values-zh-rTW/strings.xml -@@ -1,6 +1,6 @@ - <?xml version='1.0' encoding='UTF-8'?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot æ¯äžæ¬Ÿåè²»çç¶²çµ¡ä»£çæçšçšåŒïŒçšäŸä¿è·å¶ä»æçšçšåŒçäžç¶²å®åšãOrbot äœ¿çš Tor åšåšçäžç³»åçé»èŠéè·³èºïŒéå°å å¯äžŠé±èç¶²è·¯æµéãTor æ¯åèªç±è»é«ä¹æ¯åéæŸç¶²è·¯ïŒèœå¹«æšæµçŠŠæµéåæéçš®ç¶²è·¯ç£æ§æš¡åŒïŒå®åšèå°åäººçèªç±èé±ç§ãåæ¥æ©å¯æŽ»åèååéä¿ãçè³åšèåå®¶å®åšã</string> - <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string> - <string name="default_web_url">https://check.torproject.org</string> -diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml -index fb51caa1..6cf4f993 100644 ---- a/app/src/main/res/values/strings.xml -+++ b/app/src/main/res/values/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-az/strings.xml b/orbotservice/src/main/res/values-az/strings.xml -index c1d53370..9b851eb8 100644 ---- a/orbotservice/src/main/res/values-az/strings.xml -+++ b/orbotservice/src/main/res/values-az/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Pulsuz proksi tÉtbiqetmÉsi olan Orbot baÅqa tÉtbiqetmÉlÉrÉ internetdÉn daha tÉhlÃŒkÉsiz istifadÉ etmÉk imkanÄ± verir. Orbot sizin internet trafikinizi ÅifrÉlÉmÉk ÃŒÃ§ÃŒn Tordan istifadÉ edir vÉ dÃŒnyanÄ±n hÉr yerindÉ kompÃŒterlÉrin birindÉn o birinÉ sÄ±Ã§ramaqla bunu gizlÉdir. Tor pulsuz proqram tÉminatÄ±dÄ±r, eyni zamanda sizin ÅÉxsi azadlÄ±ÄÄ±nÄ±z vÉ tÉhlÃŒkÉsizliyinizÉ, gizli biznes fÉaliyyÉti vÉ ÉlaqÉlÉrÉ, o cÃŒmlÉdÉn trafik analiz adlanan dÃ¶vlÉt tÉhlÃŒkÉsizliyinÉ xÉlÉl gÉtirÉ bilÉcÉk ÅÉbÉkÉ nÉzarÉti formalarÄ±ndan mÃŒdafiÉ olunmaÄa yardÄ±m edÉn aÃ§Ä±q ÅÉbÉkÉdir.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ca/strings.xml b/orbotservice/src/main/res/values-ca/strings.xml -index c6632ded..36fb7d0b 100644 ---- a/orbotservice/src/main/res/values-ca/strings.xml -+++ b/orbotservice/src/main/res/values-ca/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">https://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-cs-rCZ/strings.xml b/orbotservice/src/main/res/values-cs-rCZ/strings.xml -index 066b230a..c7bb4d9c 100644 ---- a/orbotservice/src/main/res/values-cs-rCZ/strings.xml -+++ b/orbotservice/src/main/res/values-cs-rCZ/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-cs/strings.xml b/orbotservice/src/main/res/values-cs/strings.xml -index 65e386fa..aa78f3ae 100644 ---- a/orbotservice/src/main/res/values-cs/strings.xml -+++ b/orbotservice/src/main/res/values-cs/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-cy/strings.xml b/orbotservice/src/main/res/values-cy/strings.xml -index a48a10a4..a7f78c30 100644 ---- a/orbotservice/src/main/res/values-cy/strings.xml -+++ b/orbotservice/src/main/res/values-cy/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-da/strings.xml b/orbotservice/src/main/res/values-da/strings.xml -index 54b5004d..39a76a74 100644 ---- a/orbotservice/src/main/res/values-da/strings.xml -+++ b/orbotservice/src/main/res/values-da/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot er en gratis og Ã¥ben proxy-applikation, der gÃžr det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og Ã¥ben software, der kan hjÃŠlpe dig mod netvÃŠrksovervÃ¥gning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml -index acf26626..46bbf7bb 100644 ---- a/orbotservice/src/main/res/values-de/strings.xml -+++ b/orbotservice/src/main/res/values-de/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ist eine kostenlose Proxy-Anwendung, mit deren Hilfe andere Anwendungen das Internet sicherer nutzen kÃ¶nnen. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlÃŒsseln und ihn dann zu verbergen, indem er ÃŒber eine Reihe weltweit verteilter Computer geleitet wird. Tor ist ein freies Programm und ein offenes Netzwerk, das Ihnen hilft, sich gegen Angriffe auf die persÃ¶nliche Freiheit und die PrivatsphÃ€re oder auf vertrauliche GeschÃ€ftsbeziehungen sowie gegen die DatenÃŒberwachung aus StaatssicherheitsgrÃŒnden zu wehren.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-el/strings.xml b/orbotservice/src/main/res/values-el/strings.xml -index 675c6877..e592e349 100644 ---- a/orbotservice/src/main/res/values-el/strings.xml -+++ b/orbotservice/src/main/res/values-el/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-eo/strings.xml b/orbotservice/src/main/res/values-eo/strings.xml -index 3c103de7..f41ecf08 100644 ---- a/orbotservice/src/main/res/values-eo/strings.xml -+++ b/orbotservice/src/main/res/values-eo/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-es-rAR/strings.xml b/orbotservice/src/main/res/values-es-rAR/strings.xml -index b921a402..707ffa40 100644 ---- a/orbotservice/src/main/res/values-es-rAR/strings.xml -+++ b/orbotservice/src/main/res/values-es-rAR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-es/strings.xml b/orbotservice/src/main/res/values-es/strings.xml -index 76c8fa0b..e0bcc0a5 100644 ---- a/orbotservice/src/main/res/values-es/strings.xml -+++ b/orbotservice/src/main/res/values-es/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot es una aplicaciÃ³n libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma mÃ¡s segura. Orbot utiliza Tor para cifrar su trÃ¡fico de Internet, y luego lo oculta rebotÃ¡ndolo a travÃ©s de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como anÃ¡lisis de trÃ¡fico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">https://check.torproject.org/?lang=es</string> -diff --git a/orbotservice/src/main/res/values-et/strings.xml b/orbotservice/src/main/res/values-et/strings.xml -index 9bb32b5d..b5387cbf 100644 ---- a/orbotservice/src/main/res/values-et/strings.xml -+++ b/orbotservice/src/main/res/values-et/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-eu/strings.xml b/orbotservice/src/main/res/values-eu/strings.xml -index f824a45a..160447dc 100644 ---- a/orbotservice/src/main/res/values-eu/strings.xml -+++ b/orbotservice/src/main/res/values-eu/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-fi/strings.xml b/orbotservice/src/main/res/values-fi/strings.xml -index 2616f723..6c2a503d 100644 ---- a/orbotservice/src/main/res/values-fi/strings.xml -+++ b/orbotservice/src/main/res/values-fi/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot on ilmainen vÃ€lityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden kÃ€yttÃ€Ã€ internetiÃ€ turvallisemmin. Orbot kÃ€yttÃ€Ã€ Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrÃ€ttÃ€mÃ€llÃ€ sitÃ€ usean tietokoneen kautta ympÃ€ri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttÃ€ uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekÃ€ suojaamaan salaisia liiketoimintoja ja -yhteyksiÃ€.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml -index 3a11d068..f43bf0a2 100644 ---- a/orbotservice/src/main/res/values-fr-rFR/strings.xml -+++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sÃ©curitÃ© accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un rÃ©seau ouvert qui vous aide Ã vous dÃ©fendre contre une forme de surveillance rÃ©seau qui menace la libertÃ© personnelle et la protection des donnÃ©es personnelles, les activitÃ©s professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-fr/strings.xml b/orbotservice/src/main/res/values-fr/strings.xml -index fa051335..f7d510b1 100644 ---- a/orbotservice/src/main/res/values-fr/strings.xml -+++ b/orbotservice/src/main/res/values-fr/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot est une application proxy gratuite qui amÃ©liore l\'utilisation plus sÃ©curisÃ©e des applications. Orbot utilise Tor pour crypter votre trafic internet et le cacher en passant par une sÃ©rie d\'ordinateur partout dans le monde. Tor est un logiciel gratuit et un rÃ©seau ouvert qui vous aide Ã vous dÃ©fendre contre les surveillances de rÃ©seau qui font peur Ã la libertÃ© personnelle et la vie privÃ©e, les activitÃ©s confidentielles des entreprises et des relations, et l\'Ã©tat de la sÃ©curitÃ© connu sous le nom d\'analyse de trafic.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-gl/strings.xml b/orbotservice/src/main/res/values-gl/strings.xml -index c0afa0e4..03609374 100644 ---- a/orbotservice/src/main/res/values-gl/strings.xml -+++ b/orbotservice/src/main/res/values-gl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã© unha aplicaciÃ³n de proxy libre que permite a outras aplicaciÃ³ns usar a internet dun xeito mÃ¡is seguro. Orbot usa Tor para encriptar o teu trÃ¡fico de internet ocultando e rebotÃ¡ndoo a travÃ©s dunha serie de ordenadores ao redor do mundo. Tor Ã© software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciÃ¡is de negocios e relaciÃ³ns, e estado de seguridade coÃ±ecido como anÃ¡lise de trÃ¡fico.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-he/strings.xml b/orbotservice/src/main/res/values-he/strings.xml -index e5e33f9b..9245cdc2 100644 ---- a/orbotservice/src/main/res/values-he/strings.xml -+++ b/orbotservice/src/main/res/values-he/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ××× × ××€×××§×Š×××ª ×€×š××§×¡× ××× ×××ª ××××€×©×š×ª ×××€×××§×Š×××ª ×××š××ª ×××©×ª××© ×××× ××š× × ×××××. Orbot × ×¢××š×ª ×-Tor ××× ×××Š×€×× ××ª ×ª×¢×××š×ª ×××× ××š× × ×©×× ××××¡×××ª× ××××Š×¢××ª× × ××ª××× ××š× ××¡×€×š ×××©××× ××š××× ××¢×××. Tor ××× ×ª××× × ×××€×©××ª ××š×©×ª ×€×ª××× ×××¡×××¢×ª ×× ×××ª××× × ××€× × ×¡×××× ××¡××××× ×©× ×××Š×¢× × ××××š ×××¢×§× ×××š ×š×©×ª ×××× ××š× × ×××××××× ×¢× ××€×š××××ª, ××××š××ª ××××©××ª, ×€×¢××××××ª ×¢×¡×§×××ª ×××¢×š×××ª ×××¡×× ××©××××ª.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-hi/strings.xml b/orbotservice/src/main/res/values-hi/strings.xml -index 9156dfa2..45db42fd 100644 ---- a/orbotservice/src/main/res/values-hi/strings.xml -+++ b/orbotservice/src/main/res/values-hi/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">à€à€°à€¬à¥à€ à€à€ à€®à¥à€«à¥à€€ à€à¥à€ª</string> - <string name="menu_browse">à€¬à¥à€°à€Ÿà€à€à€Œ</string> - <string name="menu_settings">à€žà¥à€à€¿à€à€à¥à€ž</string> -diff --git a/orbotservice/src/main/res/values-hr/strings.xml b/orbotservice/src/main/res/values-hr/strings.xml -index 8d341f35..be3f647a 100644 ---- a/orbotservice/src/main/res/values-hr/strings.xml -+++ b/orbotservice/src/main/res/values-hr/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot je besplatna proxy aplikacija koja omoguÄuje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju VaÅ¡eg Internet prometa, a zatim ga skriva Å¡aljuÄi ga kroz seriju raÄunala diljem svijeta. Tor je besplatan software i otvorena mreÅŸa koja pomaÅŸe u borbi protiv nadzora mreÅŸe koji ugroÅŸava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaÅŸe u borbi protiv analize prometa.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-hu/strings.xml b/orbotservice/src/main/res/values-hu/strings.xml -index a854f25b..bb93ec6e 100644 ---- a/orbotservice/src/main/res/values-hu/strings.xml -+++ b/orbotservice/src/main/res/values-hu/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Az Orbot egy ingyenes proxy alkalmazÃ¡s, ami kÃ©pessÃ© tesz alkalmazÃ¡sokat, hogy biztonsÃ¡gosabban hasznÃ¡lhassÃ¡k az internetet. Az Orbot Tor-t hasznÃ¡l, hogy titkosÃtsa az internetforgalmadat Ã©s elrejtse azÃ¡ltal, hogy pattogtatja szÃ¡mÃtÃ³gÃ©pek sorozatain keresztÃŒl a vilÃ¡g kÃ¶rÃŒl. A Tor ingyenes szoftver Ã©s nyitott hÃ¡lÃ³zat, ami segÃt megvÃ©deni a hÃ¡lÃ³zati felÃŒgyelettÅl, ami fenyegeti a szemÃ©lyi szabadsÃ¡got Ã©s magÃ¡nÃ©letet, a bizalmas cÃ©ges tevÃ©kenysÃ©geket Ã©s kapcsolatokat, Ã©s Ã¡llambiztonsÃ¡g cÃmÃ©n a forgalomelemzÃ©stÅl.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-id/strings.xml b/orbotservice/src/main/res/values-id/strings.xml -index c91af41b..f958e63f 100644 ---- a/orbotservice/src/main/res/values-id/strings.xml -+++ b/orbotservice/src/main/res/values-id/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-in-rID/strings.xml b/orbotservice/src/main/res/values-in-rID/strings.xml -index c91af41b..f958e63f 100644 ---- a/orbotservice/src/main/res/values-in-rID/strings.xml -+++ b/orbotservice/src/main/res/values-in-rID/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-in/strings.xml b/orbotservice/src/main/res/values-in/strings.xml -index 42c44612..01701557 100644 ---- a/orbotservice/src/main/res/values-in/strings.xml -+++ b/orbotservice/src/main/res/values-in/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml -index bb91f636..e3381d11 100644 ---- a/orbotservice/src/main/res/values-is/strings.xml -+++ b/orbotservice/src/main/res/values-is/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot er Ã³keypis proxy smÃ¡forrit sem gerir Ã¶Ã°rum smÃ¡forritum kleift aÃ° nota veraldarvefinn Ã¡ Ã¶ruggari hÃ¡tt. Orbot notar Tor til aÃ° dulkÃ³Ã°a umferÃ° ÃŸÃna Ã¡ netinu og felur hana svo meÃ° aÃ° hoppa Ã gegnum fjÃ¶lda tÃ¶lva um allan heim. Tor er Ã³keypis hugbÃºnaÃ°ur og opiÃ° net sem aÃ°stoÃ°ar ÃŸig viÃ° aÃ° verjast gegn eftirliti Ã¡ netinu sem vinnur gegn frelsi einkalÃfsins og friÃ°helgi, trÃºnaÃ°ar viÃ°skiptamÃ¡lum og sambÃ¶ndum, og rÃkisÃ¶ryggi ÃŸekkt sem umferÃ°argreining.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-it/strings.xml b/orbotservice/src/main/res/values-it/strings.xml -index a09c43e3..75accf86 100644 ---- a/orbotservice/src/main/res/values-it/strings.xml -+++ b/orbotservice/src/main/res/values-it/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ãš un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera piÃ¹ sicura. Orbot usa Tor per cifrare il traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor Ãš un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertÃ e privacy personale, attivitÃ commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-iw/strings.xml b/orbotservice/src/main/res/values-iw/strings.xml -index e5e33f9b..9245cdc2 100644 ---- a/orbotservice/src/main/res/values-iw/strings.xml -+++ b/orbotservice/src/main/res/values-iw/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ××× × ××€×××§×Š×××ª ×€×š××§×¡× ××× ×××ª ××××€×©×š×ª ×××€×××§×Š×××ª ×××š××ª ×××©×ª××© ×××× ××š× × ×××××. Orbot × ×¢××š×ª ×-Tor ××× ×××Š×€×× ××ª ×ª×¢×××š×ª ×××× ××š× × ×©×× ××××¡×××ª× ××××Š×¢××ª× × ××ª××× ××š× ××¡×€×š ×××©××× ××š××× ××¢×××. Tor ××× ×ª××× × ×××€×©××ª ××š×©×ª ×€×ª××× ×××¡×××¢×ª ×× ×××ª××× × ××€× × ×¡×××× ××¡××××× ×©× ×××Š×¢× × ××××š ×××¢×§× ×××š ×š×©×ª ×××× ××š× × ×××××××× ×¢× ××€×š××××ª, ××××š××ª ××××©××ª, ×€×¢××××××ª ×¢×¡×§×××ª ×××¢×š×××ª ×××¡×× ××©××××ª.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ja/strings.xml b/orbotservice/src/main/res/values-ja/strings.xml -index d283168d..6546c60c 100644 ---- a/orbotservice/src/main/res/values-ja/strings.xml -+++ b/orbotservice/src/main/res/values-ja/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbotã¯ä»ã®ã¢ããªãã€ã³ã¿ãŒããããããå®åšã«äœ¿ãããšãå¯èœã«ããããªãŒã®ãããã·ã¢ããªã§ããOrbotã§ã¯ãTorãçšããŠããªãã®ç«¯æ«ã®ãã©ãã£ãã¯ãæå·åããäžçäžã®ã³ã³ãã¥ãŒã¿ãŒãäžç¶ããããšã§ããã®ãã©ãã£ãã¯ãé ããŸããTorã¯ããªãŒã®ãœãããŠã§ã¢ãšãªãŒãã³ãªãããã¯ãŒã¯ã§ããããŠãŒã¶ãŒã®èªç±ãšãã©ã€ãã·ãŒãèããç£èŠæŽ»åããæ©å¯ã®ããžãã¹æŽ»åãåœå®¶ã«ãããã©ãã£ãã¯åæããèº«ãå®ãããšãå©ããŠãããŸãã</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ko/strings.xml b/orbotservice/src/main/res/values-ko/strings.xml -index 765b5720..623d9334 100644 ---- a/orbotservice/src/main/res/values-ko/strings.xml -+++ b/orbotservice/src/main/res/values-ko/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-lv/strings.xml b/orbotservice/src/main/res/values-lv/strings.xml -index 33eb1852..d8eca2b9 100644 ---- a/orbotservice/src/main/res/values-lv/strings.xml -+++ b/orbotservice/src/main/res/values-lv/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespÄju citÄm lietotnÄm droÅ¡Äk lietot internetu. Orbot izmanto Tor, lai Å¡ifrÄtu JÅ«su interneta datplÅ«smu, tad to paslÄpj, pÄrsÅ«tot to caur daudziem datoriem visÄ pasaulÄ. Tor ir bezmaksas programmatÅ«ra un atvÄrts tÄ«kls, kas palÄ«dz Jums aizsargÄties pret tÄ«kla uzraudzÄ«bas veidu - datplÅ«smas analÄ«zi -, ar kuras palÄ«dzÄ«bu tiek apdraudÄta personiskÄ brÄ«vÄ«ba un privÄtums, konfidenciÄlas lietiÅ¡Ä·as darbÄ«bas un attiecÄ«bas, kÄ arÄ« valsts droÅ¡Ä«ba. </string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-mk/strings.xml b/orbotservice/src/main/res/values-mk/strings.xml -index 4d48678a..88957145 100644 ---- a/orbotservice/src/main/res/values-mk/strings.xml -+++ b/orbotservice/src/main/res/values-mk/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ðµ ÑÐ»ÐŸÐ±ÐŸÐŽÐœÐ° Ð¿ÑÐŸÐºÑÐž Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÑÐ° ÐºÐŸÑÐ° ÐžÐŒ ÐŸÐ²ÐŸÐ·ÐŒÐŸÐ¶ÑÐ²Ð° ÐœÐ° ÐŽÑÑÐ³ÐžÑÐµ Ð°Ð¿Ð»ÐžÐºÐ°ÑÐžÐž ÐŽÐ° Ð³ÐŸ ÐºÐŸÑÐžÑÑÐ°Ñ ÐžÐœÑÐµÑÐœÐµÑÐŸÑ Ð¿ÐŸÐ±ÐµÐ·Ð±ÐµÐŽÐœÐŸ. Orbot ÐºÐŸÑÐžÑÑÐž Tor Ð·Ð° ÑÐžÑÑÐžÑÐ°ÑÐµ ÐœÐ° ÐžÐœÑÐµÑÐœÐµÑ-ÑÐŸÐŸÐ±ÑÐ°ÑÐ°ÑÐŸÑ, Ð° Ð¿ÐŸÑÐŸÐ° Ð³ÐŸ ÑÐŸÐºÑÐžÐ²Ð° Ðž Ð³ÐŸ ÐŽÐŸÑÑÐ°Ð²ÑÐ²Ð° Ð¿ÑÐµÐºÑ ÐœÐµÐºÐŸÐ»ÐºÑ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÐž Ð²ÐŸ ÑÐµÐ»ÐžÐŸÑ ÑÐ²ÐµÑ. Tor Ðµ ÑÐ»ÐŸÐ±ÐŸÐŽÐµÐœ ÑÐŸÑÑÐ²ÐµÑ Ðž ÐŸÑÐ²ÐŸÑÐµÐœÐ° ÐŒÑÐµÐ¶Ð° ÐºÐŸÑÐ° ÑÐµ ÑÐ¿ÑÐ°Ð²ÑÐ²Ð° ÑÐŸ Ð²ÐžÐŽ ÐœÐ°ÐŽÐ·ÐŸÑ ÐœÐ° ÐŒÑÐµÐ¶Ð°ÑÐ° ÐºÐŸÑÐ° ÑÑÐµÑÐž ÐœÐ° Ð»ÐžÑÐœÐ°ÑÐ° ÑÐ»ÐŸÐ±ÐŸÐŽÐ° Ðž Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÑÑÐ°, ÐŽÐŸÐ²ÐµÑÐ»ÐžÐ²Ðž ÐŽÐµÐ»ÐŸÐ²ÐœÐž Ð°ÐºÑÐžÐ²ÐœÐŸÑÑÐž Ðž ÐŸÐŽÐœÐŸÑÐž, Ðž ÐŽÑÐ¶Ð°Ð²ÐœÐ°ÑÐ° Ð±ÐµÐ·Ð±ÐµÐŽÐœÐŸÑÑ Ð¿ÐŸÐ·ÐœÐ°ÑÐ° ÐºÐ°ÐºÐŸ Ð°ÐœÐ°Ð»ÐžÐ·Ð° ÐœÐ° ÑÐŸÐŸÐ±ÑÐ°ÑÐ°ÑÐŸÑ.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ms-rMY/strings.xml b/orbotservice/src/main/res/values-ms-rMY/strings.xml -index c9cecc16..d991a2ac 100644 ---- a/orbotservice/src/main/res/values-ms-rMY/strings.xml -+++ b/orbotservice/src/main/res/values-ms-rMY/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ms/strings.xml b/orbotservice/src/main/res/values-ms/strings.xml -index 8e56f6a1..92208048 100644 ---- a/orbotservice/src/main/res/values-ms/strings.xml -+++ b/orbotservice/src/main/res/values-ms/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml -index cd48c319..23d5a6d7 100644 ---- a/orbotservice/src/main/res/values-nb/strings.xml -+++ b/orbotservice/src/main/res/values-nb/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot er en gratis proxy app som gjÃžr det mulig for andre apps Ã¥ bruke internett mer sikkert. Orbot bruker Tor for Ã¥ kryptere din Internettrafikk, og skjuler da din trafikk ved Ã¥ sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er et gratis dataprogram, og et Ã¥pent nettverk som hjelper deg Ã¥ forsvare deg mot en form for nettverksovervÃ¥king som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig sikkerhet kjent som trafikkanalyse.</string> - <string name="internal_web_url">https://torproject.org</string> - <string name="default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-nl/strings.xml b/orbotservice/src/main/res/values-nl/strings.xml -index 935bd901..f61d5db6 100644 ---- a/orbotservice/src/main/res/values-nl/strings.xml -+++ b/orbotservice/src/main/res/values-nl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot is een gratis en vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te coderen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid genaamd \'traffic analyse\' bedreigt.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-pl/strings.xml b/orbotservice/src/main/res/values-pl/strings.xml -index 960bd0af..be67cc76 100644 ---- a/orbotservice/src/main/res/values-pl/strings.xml -+++ b/orbotservice/src/main/res/values-pl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot jest darmowÄ aplikacjÄ proxy ktÃ³ra wspomaga inne aplikacje do uÅŒywania internetu bezpiecznie. Orbot uÅŒywa Tora do szyfrowania Twojego ruchu internetowego i nastÄpnie przepuszczania go przez wiele innych komputereÃ³w pororzucanych na caÅym Åwiecie. Tor jest darmowym oprogramowaniem i otwartÄ sieciÄ ktÃ³ra pomaga Tobie w obronie przed monitoringiem sieci ktÃ³ra zagrarza osobistej wolnoÅci i prywatnoÅci, poufnym biznesowym aktywnoÅciom.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml -index 47bd4184..e8912642 100644 ---- a/orbotservice/src/main/res/values-pt-rBR/strings.xml -+++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã© um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais seguranÃ§a. Orbot usa o Tor para criptografar seu trÃ¡fego na internet e entÃ£o o esconde \"saltando\" entre uma sÃ©rie de computadores ao redor do mundo. Tor Ã© um software livre e de rede aberta que ajuda vocÃª a se defender de certas formas de vigilÃ¢ncia que ameaÃ§am privacidade e liberdade pessoais, atividades e relaÃ§Ãµes comerciais confidenciais e seguranÃ§a estatal conhecida como anÃ¡lise de trÃ¡fego.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-pt-rPT/strings.xml b/orbotservice/src/main/res/values-pt-rPT/strings.xml -index 20ba24b2..7ec5b7db 100644 ---- a/orbotservice/src/main/res/values-pt-rPT/strings.xml -+++ b/orbotservice/src/main/res/values-pt-rPT/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="wizard_title">Orbot</string> -  -  -diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml -index 69f7a770..bf6930e5 100644 ---- a/orbotservice/src/main/res/values-pt/strings.xml -+++ b/orbotservice/src/main/res/values-pt/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ro/strings.xml b/orbotservice/src/main/res/values-ro/strings.xml -index e445b4b7..ba48c91d 100644 ---- a/orbotservice/src/main/res/values-ro/strings.xml -+++ b/orbotservice/src/main/res/values-ro/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-rs-rAR/strings.xml b/orbotservice/src/main/res/values-rs-rAR/strings.xml -index 132b67e8..a368dfcb 100644 ---- a/orbotservice/src/main/res/values-rs-rAR/strings.xml -+++ b/orbotservice/src/main/res/values-rs-rAR/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-ru/strings.xml b/orbotservice/src/main/res/values-ru/strings.xml -index 94029fb0..82127335 100644 ---- a/orbotservice/src/main/res/values-ru/strings.xml -+++ b/orbotservice/src/main/res/values-ru/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot - ÑÑÐŸ ÑÐ²ÐŸÐ±ÐŸÐŽÐœÐ°Ñ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐ° ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÐž-ÑÐŸÐµÐŽÐžÐœÐµÐœÐžÐ¹, ÐŸÐœÐ° Ð¿ÐŸÐ·Ð²ÐŸÐ»ÑÐµÑ ÐŽÑÑÐ³ÐžÐŒ Ð¿ÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÑÐŒ Ð±ÐŸÐ»ÐµÐµ Ð±ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸ ÐžÑÐ¿ÐŸÐ»ÑÐ·ÐŸÐ²Ð°ÑÑ ÐžÐœÑÐµÑÐœÐµÑ-ÑÐŸÐµÐŽÐžÐœÐµÐœÐžÐµ. Orbot ÐžÑÐ¿ÐŸÐ»ÑÐ·ÑÐµÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÐŸÐ²Ð°ÐœÐžÑ ÐžÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÐžÐºÐ°, ÐºÐŸÑÐŸÑÑÐ¹ Ð·Ð°ÑÐµÐŒ ÑÐºÑÑÐ²Ð°ÐµÑÑÑ Ð² ÑÐŸÐŽÐµ Ð¿ÐµÑÐµÑÑÐ»ÐºÐž ÑÐµÑÐµÐ· ÐœÐµÑÐºÐŸÐ»ÑÐºÐŸ ÐºÐŸÐŒÐ¿ÑÑÑÐµÑÐŸÐ² Ð² ÑÐ°Ð·ÐœÑÑ ÑÐ°ÑÑÑÑ Ð¿Ð»Ð°ÐœÐµÑÑ. Tor ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ²ÐŸÐ±ÐŸÐŽÐœÑÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐœÑÐŒ Ð¿ÑÐžÐ»ÐŸÐ¶ÐµÐœÐžÐµÐŒ, Ð° ÑÐ°ÐºÐ¶Ðµ ÐŸÑÐºÑÑÑÐŸÐ¹ ÑÐµÑÑÑ, Ð¿ÐŸÐŒÐŸÐ³Ð°ÑÑÐµÐ¹ Ð·Ð°ÑÐžÑÐžÑÑÑÑ ÐŸÑ ÑÐ»ÐµÐ¶ÐºÐž Ð² ÑÐµÑÑÑ, ÑÐ³ÑÐŸÐ¶Ð°ÑÑÐµÐ¹ Ð»ÐžÑÐœÐŸÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÐµ Ðž ÑÐ°ÑÑÐœÐŸÐ¹ Ð¶ÐžÐ·ÐœÐž, ÐºÐŸÐœÑÐžÐŽÐµÐœÑÐžÐ°Ð»ÑÐœÑÐŒ Ð±ÐžÐ·ÐœÐµÑ-ÐŽÐµÑÑÐµÐ»ÑÐœÐŸÑÑÐž Ðž ÐºÐŸÐœÑÐ°ÐºÑÐ°ÐŒ, Ð° ÑÐ°ÐºÐ¶Ðµ Ð³ÐŸÑÑÐŽÐ°ÑÑÑÐ²ÐµÐœÐœÐŸÐ¹ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐŒÐµ Ð± ÐµÐ·ÐŸÐ¿Ð°ÑÐœÐŸÑÑÐž, ÐžÐ·Ð²ÐµÑÑÐœÐŸÐ¹ ÐºÐ°Ðº Ð°ÐœÐ°Ð»ÐžÐ· ÑÑÐ°ÑÐžÐºÐ°.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-si-rLK/strings.xml b/orbotservice/src/main/res/values-si-rLK/strings.xml -index dfda50a4..5880bf97 100644 ---- a/orbotservice/src/main/res/values-si-rLK/strings.xml -+++ b/orbotservice/src/main/res/values-si-rLK/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-sk/strings.xml b/orbotservice/src/main/res/values-sk/strings.xml -index 2f648ef5..20841e2b 100644 ---- a/orbotservice/src/main/res/values-sk/strings.xml -+++ b/orbotservice/src/main/res/values-sk/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-sl/strings.xml b/orbotservice/src/main/res/values-sl/strings.xml -index 1b8a4c6b..12ac776d 100644 ---- a/orbotservice/src/main/res/values-sl/strings.xml -+++ b/orbotservice/src/main/res/values-sl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org/?lang=sl</string> - <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string> -diff --git a/orbotservice/src/main/res/values-sn/strings.xml b/orbotservice/src/main/res/values-sn/strings.xml -index ad1cd1de..d5ade2c6 100644 ---- a/orbotservice/src/main/res/values-sn/strings.xml -+++ b/orbotservice/src/main/res/values-sn/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> - <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> -diff --git a/orbotservice/src/main/res/values-sv/strings.xml b/orbotservice/src/main/res/values-sv/strings.xml -index e176cb2a..e56ebd05 100644 ---- a/orbotservice/src/main/res/values-sv/strings.xml -+++ b/orbotservice/src/main/res/values-sv/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot Ã€r en gratis proxyapp som mÃ¶jliggÃ¶r andra appar att anvÃ€nda internet mer sÃ€kert. Orbot anvÃ€nder Tor fÃ¶r att kryptera din internettrafik och dÃ¶ljer den genom att den studsar genom ett antal datorer vÃ€rlden Ã¶ver. Tor Ã€r fri programvara och ett Ã¶ppet nÃ€tverk som hjÃ€lper dig att skydda dig mot en form av nÃ€tverksÃ¶vervakning som hotar personlig integritet och frihet, hemliga affÃ€rsaktiviteter och relationer, och skyddar mot statlig Ã¶vervakning Ã€ven kallad trafikanalys.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-th/strings.xml b/orbotservice/src/main/res/values-th/strings.xml -index d73cfbe4..2d0ea772 100644 ---- a/orbotservice/src/main/res/values-th/strings.xml -+++ b/orbotservice/src/main/res/values-th/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-tl/strings.xml b/orbotservice/src/main/res/values-tl/strings.xml -index ab165c1e..f2ef8e30 100644 ---- a/orbotservice/src/main/res/values-tl/strings.xml -+++ b/orbotservice/src/main/res/values-tl/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml -index ac750255..ec2a1f17 100644 ---- a/orbotservice/src/main/res/values-tr/strings.xml -+++ b/orbotservice/src/main/res/values-tr/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot baÅka uygulamalarÄ±n interneti daha gÃŒvenli olarak kullanmasÄ±nÄ± saÄlayan ÃŒcretsiz bir proxy uygulamasÄ±dÄ±r. Orbot Tor\'u kullanarak internet trafiÄinizi Åifreler ve dÃŒnya ÃŒzerindeki pek Ã§ok farklÄ± bilgisayardan geÃ§irerek gizler. Tor sizin kiÅisel Ã¶zgÃŒrlÃŒÄÃŒnÃŒzÃŒ ve mahremiyetinizi, gizli ticari aktivitelerinizi ve baÄlantÄ±larÄ±nÄ±zÄ± koruma altÄ±na alan bir yazÄ±lÄ±m ve aÃ§Ä±k aÄdÄ±r.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">https://check.torproject.org/?lang=tr</string> -diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml -index 9672e2c2..2bea2383 100644 ---- a/orbotservice/src/main/res/values-uk/strings.xml -+++ b/orbotservice/src/main/res/values-uk/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot â ÑÐµ Ð²ÑÐ»ÑÐœÐ° Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐ° ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑ-Ð·\'ÑÐŽÐœÐ°ÐœÑ, ÑÐºÐ° ÐŽÐŸÐ·Ð²ÐŸÐ»ÑÑ ÑÐœÑÐžÐŒ ÐŽÐŸÐŽÐ°ÑÐºÐ°ÐŒ Ð±ÐµÐ·Ð¿ÐµÑÐœÑÑÐµ Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÐ²Ð°ÑÐž ÑÐœÑÐµÑÐœÐµÑ-Ð·\'ÑÐŽÐœÐ°ÐœÐœÑ. Orbot Ð²ÐžÐºÐŸÑÐžÑÑÐŸÐ²ÑÑ Tor ÐŽÐ»Ñ ÑÐžÑÑÑÐ²Ð°ÐœÐœÑ ÑÐœÑÐµÑÐœÐµÑ-ÑÑÐ°ÑÑÐºÑ, ÑÐºÐžÐ¹ ÐŽÐ°Ð»Ñ Ð¿ÑÐžÑÐŸÐ²ÑÑÑÑÑÑ Ð¿ÑÐŽ ÑÐ°Ñ Ð¿ÐµÑÐµÑÐžÐ»Ð°ÐœÐœÑ ÑÐµÑÐµÐ· ÐºÑÐ»ÑÐºÐ° ÐºÐŸÐŒÐ¿\'ÑÑÐµÑÑÐ² Ñ ÑÑÐ·ÐœÐžÑ ÑÐ°ÑÑÐžÐœÐ°Ñ Ð¿Ð»Ð°ÐœÐµÑÐž. Tor Ñ Ð²ÑÐ»ÑÐœÐžÐŒ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐœÐžÐŒ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐœÐœÑÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ Ð²ÑÐŽÐºÑÐžÑÐŸÑ ÐŒÐµÑÐµÐ¶ÐµÑ, ÑÐŸ ÐŽÐŸÐ¿ÐŸÐŒÐ°Ð³Ð°Ñ Ð·Ð°ÑÐžÑÑÐžÑÐžÑÑ Ð²ÑÐŽ ÐŒÐµÑÐµÐ¶ÐµÐ²ÐŸÐ³ÐŸ ÑÑÐµÐ¶ÐµÐœÐœÑ, ÑÐºÐµ Ð·Ð°Ð³ÑÐŸÐ¶ÑÑ ÐŸÑÐŸÐ±ÐžÑÑÑÐ¹ ÑÐ²ÐŸÐ±ÐŸÐŽÑ ÑÐ° Ð¿ÑÐžÐ²Ð°ÑÐœÐŸÐŒÑ Ð¶ÐžÑÑÑ, ÐºÐŸÐœÑÑÐŽÐµÐœÑÑÐ¹ÐœÑÐ¹ Ð±ÑÐ·ÐœÐµÑ-ÐŽÑÑÐ»ÑÐœÐŸÑÑÑ Ñ ÐºÐŸÐœÑÐ°ÐºÑÐ°ÐŒ, Ð° ÑÐ°ÐºÐŸÐ¶ ÐŽÐµÑÐ¶Ð°Ð²ÐœÐŸÑ Ð¿ÑÐŸÐ³ÑÐ°ÐŒÐž Ð±ÐµÐ·Ð¿ÐµÐºÐž, ÑÐŸ Ð ²ÑÐŽÐŸÐŒÐ° ÑÐº Ð°ÐœÐ°Ð»ÑÐ· ÑÑÐ°ÑÑÐºÑ.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-uz/strings.xml b/orbotservice/src/main/res/values-uz/strings.xml -index 785d9672..cff0ea57 100644 ---- a/orbotservice/src/main/res/values-uz/strings.xml -+++ b/orbotservice/src/main/res/values-uz/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml -index 0401b9ce..d844ce8c 100644 ---- a/orbotservice/src/main/res/values-vi/strings.xml -+++ b/orbotservice/src/main/res/values-vi/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot lÃ má»t á»©ng dá»¥ng proxy miá»n phÃ, ÄÆ°á»£c thiáº¿t káº¿ Äá» lÃ m cho cÃ¡c á»©ng dá»¥ng khÃ¡c káº¿t ná»i vá»i Internet má»t cÃ¡ch an toÃ n. Orbot sá» dá»¥ng Tor Äá» mÃ£ hÃ³a cÃ¡c káº¿t ná»i Internet rá»i áº©n danh nÃ³ thÃŽng qua má»t loáº¡t cÃ¡c nÃºt trong máº¡ng Tor. Tor lÃ pháº§n má»m miá»n phÃ vÃ lÃ má»t máº¡ng lÆ°á»i má» giÃºp báº¡n chá»ng láº¡i sá»± giÃ¡m sÃ¡t máº¡ng, vá»n Äe dá»a riÃªng tÆ° trá»±c tuyáº¿n, hay cÃ¡c hoáº¡t Äá»ng bÃ máºt...</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml -index 49459292..f2754d65 100644 ---- a/orbotservice/src/main/res/values-zh-rCN/strings.xml -+++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot æ¯äžæ¬ŸåèŽ¹çä»£çåºçšïŒèœå€è®©å¶ä»åºçšæŽå®åšå°äœ¿çšäºèçœãéè¿åšäœäºäžçåå°çäžç³»åè®¡ç®æºä¹éŽè¿è¡è·³èœ¬ïŒOrbot å¯å©çš Tor å¯¹çœç»éä¿¡è¿è¡å å¯å¹¶éèãTor æ¯äžæ¬ŸåèŽ¹çèœ¯ä»¶ïŒå¹¶äžæ¯äžäžªåŒæŸççœç»ãå®å¯ä»¥ä¿æ€çšæ·ååæµéåæçå±å®³ïŒè¿ç§çœç»çæ§å¯å¯¹äžªäººèªç±äžéç§ãåäžæºå¯æŽ»åšåå³ç³»ä»¥ååœå®¶å®åšé æåšèã</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> -diff --git a/orbotservice/src/main/res/values-zh-rTW/strings.xml b/orbotservice/src/main/res/values-zh-rTW/strings.xml -index b255c75c..2558fef6 100644 ---- a/orbotservice/src/main/res/values-zh-rTW/strings.xml -+++ b/orbotservice/src/main/res/values-zh-rTW/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbotæ¯äžæ¬Ÿåè²»çç¶²çµ¡ä»£çæçšçšåŒïŒçšäŸä¿è·å¶ä»æçšçšåŒçäžç¶²å®åšã - Orbotäœ¿çšToråšåšçäžç³»åçé»èŠéè·³èºïŒä»¥äŸ¿é±èç¶²è·¯æµéäžŠå å¯ãToræ¯ååè²»è»é«ä¹æ¯åéæŸç¶²è·¯ïŒèœå¹«æšæµçŠŠæµéåæãå®æ¯æäžçš®ç¶²è·¯ç£æ§ïŒçœæ¶å°åäººçèªç±èé±ç§ãåæ¥éšåçæ©å¯éä¿åæŽ»åãçè³åå®¶å®åšã</string> - <string name="internal_web_url">http://orbot/</string> -diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml -index 11485598..f269d88f 100644 ---- a/orbotservice/src/main/res/values/strings.xml -+++ b/orbotservice/src/main/res/values/strings.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <resources> -- <string name="app_name">Orbot</string> -+ <string name="app_name">Tor Browser</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> --- -2.17.1 - diff --git a/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch b/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch deleted file mode 100644 index 778196f..0000000 --- a/projects/orbot/0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 10f169fd4f963f1cdcd7e6a2b8306322bb54e901 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Tue, 27 Nov 2018 15:37:22 +0000 -Subject: [PATCH 11/13] Bug 28051 - Tell Proguard it should keep an unused - method - ---- - app/proguard-rules.txt | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt -index b1120f82..3a8d4ef9 100644 ---- a/app/proguard-rules.txt -+++ b/app/proguard-rules.txt -@@ -11,4 +11,12 @@ - -keep class okhttp3.** { *; } - -keep interface okhttp3.** { *; } - -dontwarn okhttp3.** ---dontwarn okio.** -\ No newline at end of file -+-dontwarn okio.** -+ -+# This method is called in the main Application (which is now -+# Fennec's GeckoApplication), so we must explicitly keep this -+# or else proguard sees it is not used when then library is -+# compiled and prunes it. -+-keep class org.torproject.android.settings.Languages { -+ void setup(java.lang.Class, int); -+} --- -2.17.1 - diff --git a/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch b/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch deleted file mode 100644 index 89592c0..0000000 --- a/projects/orbot/0012-Bug-28051-Escape-the-apostrophe-correctly.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 14a02d41d9be2ab7a90f9af321e07e07ae3c2b15 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Sat, 24 Nov 2018 04:55:53 +0000 -Subject: [PATCH 12/13] Bug 28051 - Escape the apostrophe correctly - ---- - app/src/main/res/values-be/strings.xml | 12 ++++++------ - app/src/main/res/values-en-rGB/poestrings.xml | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml -index c4ff8ec9..03d8e29d 100644 ---- a/app/src/main/res/values-be/strings.xml -+++ b/app/src/main/res/values-be/strings.xml -@@ -43,9 +43,9 @@ - <string name="pref_transparent_all_title">ÐÐ°ÐºÑÑÐŸÑÐ²Ð°ÑÑ ÑÑÑ Ð¿ÑÐ°Ð· Tor</string> - <string name="pref_transparent_all_summary">ÐÐ°ÐºÑÑÐŸÑÐ²Ð°ÑÑ ÑÑÐ°ÑÑÐº ÑÑÑÑ ÐŽÐ°ÐŽÐ°ÑÐºÐ°Ñ Ð¿ÑÐ°Ð· Tor</string> - <string name="pref_transparent_port_fallback_title">Ð ÑÐ·ÐµÑÐ²ÐŸÐ²Ñ Ð¿ÐŸÑÑ Ð¿ÑÐŸÐºÑÑ</string> -- <string name="pref_transparent_port_fallback_summary">ÐÐÐÐ¯Ð ÐÐÐÐÐÐÐ: Ð°Ð±ÑÑÐŸÐŽÐ·ÑÑÑ Ð°Ð³ÑÐ»ÑÐœÑÑ Ð¿Ð°ÑÑÑ (80, 443 Ñ Ð³. ÐŽ.). *ÐÐ«ÐÐÐ Ð«Ð¡Ð¢ÐÐÐÐÐŠÐ¬ Ð¢ÐÐÐ¬ÐÐ* ÐºÐ°Ð»Ñ ÑÑÐ¶ÑÐŒÑ \\'Ð£ÑÑ\\' ÑÑ \\'ÐÐ°ÐŽÐ°ÑÐ°Ðº\\' ÐœÐµ Ð¿ÑÐ°ÑÑÑÑÑ.</string> -+ <string name="pref_transparent_port_fallback_summary">ÐÐÐÐ¯Ð ÐÐÐÐÐÐÐ: Ð°Ð±ÑÑÐŸÐŽÐ·ÑÑÑ Ð°Ð³ÑÐ»ÑÐœÑÑ Ð¿Ð°ÑÑÑ (80, 443 Ñ Ð³. ÐŽ.). *ÐÐ«ÐÐÐ Ð«Ð¡Ð¢ÐÐÐÐÐŠÐ¬ Ð¢ÐÐÐ¬ÐÐ* ÐºÐ°Ð»Ñ ÑÑÐ¶ÑÐŒÑ \'Ð£ÑÑ\' ÑÑ \'ÐÐ°ÐŽÐ°ÑÐ°Ðº\' ÐœÐµ Ð¿ÑÐ°ÑÑÑÑÑ.</string> - <string name="pref_transparent_port_title">Ð¡Ð¿ÑÑ Ð¿Ð°ÑÑÐŸÑ</string> -- <string name="pref_transparent_port_summary">Ð¡Ð¿ÑÑ Ð¿Ð°ÑÑÐŸÑ ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑÐºÐ°ÑÑÑ. *ÐÐ«ÐÐÐ Ð«Ð¡Ð¢ÐÐÐÐÐŠÐ¬ Ð¢ÐÐÐ¬ÐÐ* ÐºÐ°Ð»Ñ ÑÑÐ¶ÑÐŒÑ \\'Ð£ÑÑ\\' ÑÑ \\'ÐÐ°ÐŽÐ°ÑÐ°Ðº\\' ÐœÐµ Ð¿ÑÐ°ÑÑÑÑÑ.</string> -+ <string name="pref_transparent_port_summary">Ð¡Ð¿ÑÑ Ð¿Ð°ÑÑÐŸÑ ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑÐºÐ°ÑÑÑ. *ÐÐ«ÐÐÐ Ð«Ð¡Ð¢ÐÐÐÐÐŠÐ¬ Ð¢ÐÐÐ¬ÐÐ* ÐºÐ°Ð»Ñ ÑÑÐ¶ÑÐŒÑ \'Ð£ÑÑ\' ÑÑ \'ÐÐ°ÐŽÐ°ÑÐ°Ðº\' ÐœÐµ Ð¿ÑÐ°ÑÑÑÑÑ.</string> - <string name="pref_transparent_port_dialog">Ð£Ð²ÑÐŽÐ·ÑÑÐµ Ð¿Ð°ÑÑÑ ÐŽÐ»Ñ Ð¿ÑÐŸÐºÑÑÑÐ°ÑÑÑ</string> - <string name="pref_has_root">ÐÐ°Ð¿ÑÑÐ°ÑÑ root-ÐŽÐŸÑÑÑÐ¿</string> - <string name="pref_has_root_summary">ÐÐ°Ð¿ÑÑÐ°ÑÑ root-ÐŽÐŸÑÑÑÐ¿ ÐŽÐ»Ñ Ð¿ÑÐ°Ð·ÑÑÑÑÐ°Ð¹ Ð¿ÑÐŸÐºÑÑÑÐ°ÑÑÑ</string> -@@ -87,7 +87,7 @@ - <string name="wizard_final_msg">ÐÑÐ»ÑÑÐœÑ Ð»ÑÐŽÐ·ÐµÐ¹ Ð²Ð° ÑÑÑÐŒ ÑÐ²ÐµÑÐµ Ð²ÑÐºÐ°ÑÑÑÑÐŸÑÐ²Ð°ÑÑÑ Tor Ð¿Ð° ÑÐŸÐ·ÐœÑÑ Ð¿ÑÑÑÑÐœÐ°Ñ. ÐÑÑÐœÐ°Ð»ÑÑÑÑ Ñ Ð±Ð»ÐŸÐ³ÐµÑÑ, Ð¿ÑÐ°Ð²Ð°Ð°Ð±Ð°ÑÐŸÐœÑÑ, ÑÑÐ¿ÑÐ°ÑÐŸÑÐœÑÐºÑ Ð¿ÑÐ°Ð²Ð°Ð°ÑÐŸÑÐœÑÑ ÐŸÑÐ³Ð°ÐœÐ°Ñ, ÑÐ°Ð»ÐŽÐ°ÑÑ, ÐºÐ°ÑÐ¿Ð°ÑÐ°ÑÑÑ, Ð³ÑÐ°ÐŒÐ°ÐŽÐ·ÑÐœÐµ ÐºÑÐ°ÑÐœ Ð· ÑÑÐ¿ÑÑÑÑÑÐœÑÐŒ ÑÑÐ¶ÑÐŒÐ°ÐŒ Ñ Ð¿ÑÐŸÑÑÐ° Ð·Ð²ÑÑÐ°Ð¹ÐœÑÑ Ð³ÑÐ°ÐŒÐ°ÐŽÐ·ÑÐœÐµ..., Ð° Ð·Ð°ÑÐ°Ð· Ð³Ð°ÑÐŸÐ²Ñ Ñ Ð²Ñ!</string> - <string name="wizard_exit_at_first_screen_toast">ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, ÐœÐ°Ð»Ð°ÐŽÐ·ÑÑÐµ Orbot Ð¿ÐµÑÑ ÑÑÐŒ Ð¿ÑÑÑÑÑÐ¿ÑÑÑ ÐŽÐ° Ð²ÑÐºÐ°ÑÑÑÑÐ°ÐœÐœÑ!</string> -  -- <string name="connect_first_time">ÐÑ Ð¿Ð°ÑÐ¿ÑÑÐŸÐ²Ð° ÐŽÐ°Ð»ÑÑÑÐ»ÑÑÑ ÐŽÐ° ÑÐµÑÐºÑ Tor, Ð°Ð»Ðµ Ð³ÑÑÐ° ÐÐ Ð·ÐœÐ°ÑÑÑÑ, ÑÑÐŸ Ð²Ð°ÑÐ° Ð¿ÑÑÐ»Ð°ÐŽÐ° Ð±ÑÑÐ¿ÐµÑÐœÐ°Ñ. ÐÑ ÐŒÐŸÐ¶Ð°ÑÐµ ÑÐºÐ°ÑÑÑÑÐ°ÑÑÐ° ÑÑÐœÐºÑÑÑÐ¹ \\'ÐÑÐ°Ð²ÐµÑÐºÐ°\\' Ð· ÐŒÐµÐœÑ, ÐºÐ°Ð± Ð¿ÑÐ°ÑÑÑÑÐ°Ð²Ð°ÑÑ Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·Ð°Ñ.\n\nÐÐ°Ð²ÐµÐŽÐ°ÐµÑÐµ ÐœÐ°Ñ ÑÐ°Ð¹Ñ https://guardianproject.info/apps/orbot ÑÑ Ð°ÐŽÐ¿ÑÐ°ÑÑÐµ Ð»ÑÑÑ ÐœÐ° Ð°ÐŽÑÐ°Ñ help(a)guardianproject.info, ÐºÐ°Ð± ÐŽÐ°Ð²ÐµÐŽÐ°ÑÑÐ° Ð±ÐŸÐ»ÑÑ.</string> -+ <string name="connect_first_time">ÐÑ Ð¿Ð°ÑÐ¿ÑÑÐŸÐ²Ð° ÐŽÐ°Ð»ÑÑÑÐ»ÑÑÑ ÐŽÐ° ÑÐµÑÐºÑ Tor, Ð°Ð»Ðµ Ð³ÑÑÐ° ÐÐ Ð·ÐœÐ°ÑÑÑÑ, ÑÑÐŸ Ð²Ð°ÑÐ° Ð¿ÑÑÐ»Ð°ÐŽÐ° Ð±ÑÑÐ¿ÐµÑÐœÐ°Ñ. ÐÑ ÐŒÐŸÐ¶Ð°ÑÐµ ÑÐºÐ°ÑÑÑÑÐ°ÑÑÐ° ÑÑÐœÐºÑÑÑÐ¹ \'ÐÑÐ°Ð²ÐµÑÐºÐ°\' Ð· ÐŒÐµÐœÑ, ÐºÐ°Ð± Ð¿ÑÐ°ÑÑÑÑÐ°Ð²Ð°ÑÑ Ð²Ð°Ñ Ð±ÑÐ°ÑÐ·Ð°Ñ.\n\nÐÐ°Ð²ÐµÐŽÐ°ÐµÑÐµ ÐœÐ°Ñ ÑÐ°Ð¹Ñ https://guardianproject.info/apps/orbot ÑÑ Ð°ÐŽÐ¿ÑÐ°ÑÑÐµ Ð»ÑÑÑ ÐœÐ° Ð°ÐŽÑÐ°Ñ help(a)guardianproject.info, ÐºÐ°Ð± ÐŽÐ°Ð²ÐµÐŽÐ°ÑÑÐ° Ð±ÐŸÐ»ÑÑ.</string> - <string name="tor_check">ÐÑÑÐ° Ð¿ÑÑÐ²ÑÐŽÐ·Ðµ ÐŽÐ° Ð·Ð°Ð¿ÑÑÐºÑ Ð±ÑÐ°ÑÐ·Ð°ÑÐ°, Ð°Ð±ÑÐ°ÐœÐ°Ð³Ð° ÐœÐ° Ð²Ð°ÑÐ°Ð¹ Ð¿ÑÑÐ»Ð°ÐŽÐ·Ðµ Ð¿Ð° Ð·ÐŒÐ°ÑÑÐ°ÐœÐœÑ, Ñ Ð¿Ð°ÐŽÐºÐ»ÑÑÑÐœÐœÑ ÐŽÐ° ÑÐ°Ð¹ÑÐ° https://check.torproject.org ÐŽÐ·ÐµÐ»Ñ Ð¿ÑÐ°Ð²ÐµÑÐºÑ Ð¿ÑÐ°Ð²ÑÐ»ÑÐœÐ°ÑÑÑ Ð¿ÑÐ°ÑÑ Orbot Ñ Ð²ÑÐ·ÐœÐ°ÑÑÐœÐœÑ, ÑÑ Ð¿Ð°ÐŽÐºÐ»ÑÑÐ°ÐœÑ Ð²Ñ ÐŽÐ° ÑÐµÑÐºÑ Tor.</string> - <string name="pref_hs_group">Ð¡ÑÐ°Ð²Ð°ÐœÑÑ ÑÐ»ÑÐ¶Ð±Ñ</string> - <string name="pref_general_group">ÐÐ³ÑÐ»ÑÐœÑÑ</string> -@@ -101,9 +101,9 @@ - <string name="wizard_warning_msg">Ð¡Ð°ÐŒÐ° Ð¿Ð° ÑÐ°Ð±Ðµ ÑÑÑÐ°Ð»ÑÑÐºÐ° Orbot ÐœÐµ Ð·ÑÐŸÐ±ÑÑÑ Ð°ÑÑÐ°ÐŒÐ°ÑÑÑÐœÐ° Ð²Ð°Ñ ÐŒÐ°Ð±ÑÐ»ÑÐœÑ ÑÑÐ°ÑÑÐº Ð°ÐœÐ°ÐœÑÐŒÐœÑÐŒ.\n\n ÐÑ Ð¿Ð°Ð²ÑÐœÐœÑ Ð¿ÑÐ°Ð²ÑÐ»ÑÐœÐ° ÐœÐ°Ð»Ð°ÐŽÐ·ÑÑÑ Orbot, Ð²Ð°ÑÑ Ð¿ÑÑÐ»Ð°ÐŽÑ Ñ ÑÐœÑÑÑ ÐŽÐ°ÐŽÐ°ÑÐºÑ, ÑÑÐŸ Ð± Ð¿Ð°ÑÐ¿ÑÑÐŸÐ²Ð° Ð²ÑÐºÐ°ÑÑÑÑÐŸÑÐ²Ð°ÑÑ Tor.</string> -  - <string name="wizard_permissions_title">ÐÐ°Ð·Ð²ÐŸÐ»Ñ</string> -- <string name="wizard_permissions_root_msg1">ÐÑ Ð³ÑÑÐ°Ðº Ð¶Ð° ÐŒÐŸÐ¶Ð°ÑÐµ Ð¿Ð° Ð¶Ð°ÐŽÐ°ÐœÐœÑ ÐŽÐ°ÑÑ Orbot Ð¿ÑÐ°Ð²Ñ \\'Ð¡ÑÐ¿ÐµÑÐºÐ°ÑÑÑÑÐ°ÑÐ°\\' ÐŽÐ»Ñ ÐŽÐŸÑÑÑÐ¿Ñ ÐŽÐ° ÐŽÐ°ÐŽÐ°ÑÐºÐŸÐ²ÑÑ ÐŒÐ°Ð³ÑÑÐŒÐ°ÑÑÑÑ ÑÑÐ¿Ñ Ð¿ÑÐ°Ð·ÑÑÑÑÐ°Ð¹ Ð¿ÑÐŸÐºÑÑÑÐ°ÑÑÑ.</string> -- <string name="wizard_permissions_root_msg2">ÐÐŽÐ°ÐµÑÑÐ°, Ð²Ð°ÑÐ° Ð¿ÑÑÐ»Ð°ÐŽÐ° ÐœÐµ ÐŒÐ°Ðµ root-Ð¿ÑÐ°Ð²ÐŸÑ Ñ ÐœÐµ Ð¿ÑÐ°Ð¿Ð°ÐœÑÐµ ÐŽÐŸÑÑÑÐ¿ \\'Ð¡ÑÐ¿ÐµÑÐºÐ°ÑÑÑÑÐ°ÑÐ°\\'.\n\nÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐ¹ÑÐµ ÑÑÐ¶ÑÐŒ \\'ÐÐ°ÐŽÐ°ÑÐºÑ\\' ÐœÐ° Ð³Ð°Ð»ÐŸÑÐœÑÐŒ ÑÐºÑÐ°ÐœÐµ.</string> -- <string name="wizard_permissions_no_root_msg">ÐÐŽÐ°ÐµÑÑÐ°, Ð²Ð°ÑÐ° Ð¿ÑÑÐ»Ð°ÐŽÐ° ÐœÐµ ÐŒÐ°Ðµ root-Ð¿ÑÐ°Ð²ÐŸÑ Ñ ÐœÐµ Ð¿ÑÐ°Ð¿Ð°ÐœÑÐµ ÐŽÐŸÑÑÑÐ¿ \\'Ð¡ÑÐ¿ÐµÑÐºÐ°ÑÑÑÑÐ°ÑÐ°\\'.\n\n ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐ¹ÑÐµ ÑÑÐ¶ÑÐŒ \\'ÐÐ°ÐŽÐ°ÑÐºÑ\\' ÐœÐ° Ð³Ð°Ð»ÐŸÑÐœÑÐŒ ÑÐºÑÐ°ÐœÐµ.</string> -+ <string name="wizard_permissions_root_msg1">ÐÑ Ð³ÑÑÐ°Ðº Ð¶Ð° ÐŒÐŸÐ¶Ð°ÑÐµ Ð¿Ð° Ð¶Ð°ÐŽÐ°ÐœÐœÑ ÐŽÐ°ÑÑ Orbot Ð¿ÑÐ°Ð²Ñ \'Ð¡ÑÐ¿ÐµÑÐºÐ°ÑÑÑÑÐ°ÑÐ°\' ÐŽÐ»Ñ ÐŽÐŸÑÑÑÐ¿Ñ ÐŽÐ° ÐŽÐ°ÐŽÐ°ÑÐºÐŸÐ²ÑÑ ÐŒÐ°Ð³ÑÑÐŒÐ°ÑÑÑÑ ÑÑÐ¿Ñ Ð¿ÑÐ°Ð·ÑÑÑÑÐ°Ð¹ Ð¿ÑÐŸÐºÑÑÑÐ°ÑÑÑ.</string> -+ <string name="wizard_permissions_root_msg2">ÐÐŽÐ°ÐµÑÑÐ°, Ð²Ð°ÑÐ° Ð¿ÑÑÐ»Ð°ÐŽÐ° ÐœÐµ ÐŒÐ°Ðµ root-Ð¿ÑÐ°Ð²ÐŸÑ Ñ ÐœÐµ Ð¿ÑÐ°Ð¿Ð°ÐœÑÐµ ÐŽÐŸÑÑÑÐ¿ \'Ð¡ÑÐ¿ÐµÑÐºÐ°ÑÑÑÑÐ°ÑÐ°\'.\n\nÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐ¹ÑÐµ ÑÑÐ¶ÑÐŒ \'ÐÐ°ÐŽÐ°ÑÐºÑ\' ÐœÐ° Ð³Ð°Ð»ÐŸÑÐœÑÐŒ ÑÐºÑÐ°ÐœÐµ.</string> -+ <string name="wizard_permissions_no_root_msg">ÐÐŽÐ°ÐµÑÑÐ°, Ð²Ð°ÑÐ° Ð¿ÑÑÐ»Ð°ÐŽÐ° ÐœÐµ ÐŒÐ°Ðµ root-Ð¿ÑÐ°Ð²ÐŸÑ Ñ ÐœÐµ Ð¿ÑÐ°Ð¿Ð°ÐœÑÐµ ÐŽÐŸÑÑÑÐ¿ \'Ð¡ÑÐ¿ÐµÑÐºÐ°ÑÑÑÑÐ°ÑÐ°\'.\n\n ÐÐ°Ð»Ñ Ð»Ð°ÑÐºÐ°, Ð¿Ð°ÑÐ¿ÑÐ°Ð±ÑÐ¹ÑÐµ ÑÑÐ¶ÑÐŒ \'ÐÐ°ÐŽÐ°ÑÐºÑ\' ÐœÐ° Ð³Ð°Ð»ÐŸÑÐœÑÐŒ ÑÐºÑÐ°ÐœÐµ.</string> -  - <string name="wizard_tips_title">ÐÐ°ÐŽÐ°ÑÐºÑ, ÑÑÐŸ Ð¿ÑÐ°ÑÑÑÑÑ Ð· Orbot</string> - <string name="wizard_tips_gibberbot">ChatSecure: ÐŽÐ°ÐŽÐ°ÑÐ°Ðº ÐŽÐ»Ñ Ð±ÑÑÐ¿ÐµÑÐœÐ°Ð³Ð° Ð»ÑÑÑÐ°Ð²Ð°ÐœÐœÑ Ð· Ð¿ÑÑÐ²Ð°ÑÐœÑÐŒ ÑÑÑÑÐ°Ð²Ð°ÐœÐœÐµÐŒ</string> -diff --git a/app/src/main/res/values-en-rGB/poestrings.xml b/app/src/main/res/values-en-rGB/poestrings.xml -index 62663670..d09c7d6a 100644 ---- a/app/src/main/res/values-en-rGB/poestrings.xml -+++ b/app/src/main/res/values-en-rGB/poestrings.xml -@@ -14,7 +14,7 @@ - <string name="action_more">TELL ME MORE</string> - - <string name="vpn_setup">You can enable any app to go through Tor using our built-in VPN.</string> -- <string name="vpn_setup_sub">This won\\'t make you anonymous, but it will help get through firewalls.</string> -+ <string name="vpn_setup_sub">This won\'t make you anonymous, but it will help get through firewalls.</string> - <string name="action_vpn_choose">CHOOSE APPS</string> - - <string name="status_connected">Connected!</string> --- -2.17.1 - diff --git a/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch b/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch deleted file mode 100644 index 73d55e4..0000000 --- a/projects/orbot/0013-Bug-28051-Add-a-notification-compatibility-class.patch +++ /dev/null @@ -1,221 +0,0 @@ -From 0fde60f64b342fafc7150272c8de0544b0c430df Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Wed, 21 Nov 2018 18:05:42 +0000 -Subject: [PATCH 13/13] Bug 28051 - Add a notification compatibility class - ---- - .../android/service/TorService.java | 7 +- - .../util/NotificationBuilderCompat.java | 162 ++++++++++++++++++ - 2 files changed, 166 insertions(+), 3 deletions(-) - create mode 100644 orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java - -diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -index 189ee6ab..745e5e8b 100644 ---- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java -+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java -@@ -55,6 +55,7 @@ import org.torproject.android.control.TorControlConnection; - import org.torproject.android.service.util.OtherResourceInstaller; - import org.torproject.android.service.vpn.TorifiedApp; - import org.torproject.android.service.util.DummyActivity; -+import org.torproject.android.service.util.NotificationBuilderCompat; - import org.torproject.android.service.util.Prefs; - import org.torproject.android.service.util.TorServiceUtils; - import org.torproject.android.service.util.Utils; -@@ -120,7 +121,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - private int mNetworkType = -1; - - private NotificationManager mNotificationManager = null; -- private NotificationCompat.Builder mNotifyBuilder; -+ private NotificationBuilderCompat mNotifyBuilder; - private Notification mNotification; - private boolean mNotificationShowing = false; - -@@ -251,7 +252,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - mNotificationShowing = false; - } - -- private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1"; -+ private final static String NOTIFICATION_CHANNEL_ID = "torbrowser_channel_1"; - - // Use TargetApi until we use a support library version that adds the - // RequriesApi annotation -@@ -298,7 +299,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon - - if (mNotifyBuilder == null) - { -- mNotifyBuilder = new NotificationCompat.Builder(this) -+ mNotifyBuilder = new NotificationBuilderCompat(this, NOTIFICATION_CHANNEL_ID) - .setContentTitle(getString(R.string.app_name)) - .setSmallIcon(R.drawable.ic_stat_tor); - -diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java b/orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java -new file mode 100644 -index 00000000..eac657ff ---- /dev/null -+++ b/orbotservice/src/main/java/org/torproject/android/service/util/NotificationBuilderCompat.java -@@ -0,0 +1,162 @@ -+package org.torproject.android.service.util; -+ -+import android.app.Notification; -+import android.app.Notification.Builder; -+import android.app.Notification.Style; -+import android.app.PendingIntent; -+import android.content.Context; -+import android.graphics.Bitmap; -+import android.os.Build; -+import android.util.Log; -+ -+import java.lang.reflect.Constructor; -+ -+/* -+ * This is a compatibility wrapper-class around the native -+ * android.app.Notification.Builder class. This class is needed -+ * because we are currently targeting Android API level 26 and -+ * supporting API level 16 as the minimum level, but we're using -+ * the Android Support Library 23.4.0. This puts us in a situation -+ * where Android API 26 requires "channels", but the support library -+ * doesn't know what a channel is. -+ * -+ * This is a temporary hack until we upgrade to a newer support library -+ * (mozilla-central uses 26.1.0, at the time of this writing). -+ */ -+ -+public class NotificationBuilderCompat { -+ private static final String LOGTAG = "NotificationBuilderCompat"; -+ private static final Class notificationBuilderClass = Notification.Builder.class; -+ -+ /* Credit: http://www.javadocexamples.com/java/lang/Class/getDeclaredConstructor(...%2… */ -+ // Constructor signature before Android O -+ private static final Class[] REPLICATE_CONSTRUCTOR_PARAMS_PRE_O = new Class[]{Context.class}; -+ // Constructor signature Android O and newer -+ private static final Class[] REPLICATE_CONSTRUCTOR_PARAMS_O_PLUS = new Class[]{Context.class, String.class}; -+ -+ public static final String DEFAULT_CHANNEL_ID = "torbrowser_channel_0"; -+ -+ private Notification.Builder mBuilder; -+ -+ public NotificationBuilderCompat(Context context, String channelId) { -+ Constructor constructor; -+ -+ // If we think we're running on a device with Oreo or newer, then -+ // try constructing a Notification.Builder with a channel Id. -+ if (Build.VERSION.SDK_INT >= 26) { -+ try { -+ constructor = notificationBuilderClass.getConstructor(REPLICATE_CONSTRUCTOR_PARAMS_O_PLUS); -+ mBuilder = (Notification.Builder) constructor.newInstance(context, channelId); -+ return; -+ } catch (Exception e) {} -+ } -+ try { -+ // Fall back on the constructor without a channel ID -+ constructor = notificationBuilderClass.getConstructor(REPLICATE_CONSTRUCTOR_PARAMS_PRE_O); -+ mBuilder = (Notification.Builder) constructor.newInstance(context); -+ } catch (Exception e) { -+ mBuilder = new Notification.Builder(context); -+ } -+ } -+ -+ public NotificationBuilderCompat(Context context) { -+ this(context, DEFAULT_CHANNEL_ID); -+ } -+ -+ public NotificationBuilderCompat setContentText(CharSequence title) { -+ mBuilder = mBuilder.setContentText(title); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setContentTitle(CharSequence title) { -+ mBuilder = mBuilder.setContentTitle(title); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setSmallIcon(int icon, int level) { -+ mBuilder = mBuilder.setSmallIcon(icon, level); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setSmallIcon(int icon) { -+ mBuilder = mBuilder.setSmallIcon(icon); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setLargeIcon(Bitmap b) { -+ mBuilder = mBuilder.setLargeIcon(b); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setContentIntent(PendingIntent intent) { -+ mBuilder = mBuilder.setContentIntent(intent); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setCategory(String category) { -+ // This was added in API level 21 -+ if (Build.VERSION.SDK_INT >= 21) { -+ mBuilder = mBuilder.setCategory(category); -+ } -+ return this; -+ } -+ -+ public NotificationBuilderCompat addAction(int icon, CharSequence title, PendingIntent intent) { -+ mBuilder = mBuilder.addAction(icon, title, intent); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setOngoing(boolean ongoing) { -+ mBuilder = mBuilder.setOngoing(ongoing); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setTicker(CharSequence tickerText) { -+ mBuilder = mBuilder.setTicker(tickerText); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setPriority(int prio) { -+ mBuilder = mBuilder.setPriority(prio); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setDeleteIntent(PendingIntent intent) { -+ mBuilder = mBuilder.setDeleteIntent(intent); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setAutoCancel(boolean autoCancel) { -+ mBuilder = mBuilder.setAutoCancel(autoCancel); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setDefaults(int defaults) { -+ mBuilder = mBuilder.setDefaults(defaults); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setStyle(Notification.Style style) { -+ mBuilder = mBuilder.setStyle(style); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setWhen(long when) { -+ mBuilder = mBuilder.setWhen(when); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setProgress(int max, int progress, boolean indeterminate) { -+ mBuilder = mBuilder.setProgress(max, progress, indeterminate); -+ return this; -+ } -+ -+ public NotificationBuilderCompat setLights(int argb, int onMs, int offMs) { -+ mBuilder = mBuilder.setLights(argb, onMs, offMs); -+ return this; -+ } -+ -+ public Notification build() { -+ return mBuilder.build(); -+ } -+} --- -2.17.1 - diff --git a/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch b/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch deleted file mode 100644 index b841723..0000000 --- a/projects/orbot/0014-Bug-29794-Update-built-in-bridges.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 53a2ebc7fa4ce959203c94c874efc5ee6d070020 Mon Sep 17 00:00:00 2001 -From: Matthew Finkel <Matthew.Finkel(a)gmail.com> -Date: Fri, 15 Mar 2019 16:47:06 +0000 -Subject: [PATCH] Bug 29794 - Update built-in bridges - ---- - orbotservice/src/main/res/raw/bridges.txt | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/orbotservice/src/main/res/raw/bridges.txt b/orbotservice/src/main/res/raw/bridges.txt -index 1e448ea1..61019737 100644 ---- a/orbotservice/src/main/res/raw/bridges.txt -+++ b/orbotservice/src/main/res/raw/bridges.txt -@@ -1,7 +1,11 @@ --obfs4 78.215.187.186:45675 AE907EE5FAA5D0D27E0C83EFA6ADF8E79FCC0FF1 cert=/TRjMo+RinKaixARMjMtZZBhystaBe+aDaapPrbiITFtWx3M/AJcvpjHjO54tJqLd1+IWQ iat-mode=0 --obfs4 107.160.7.24:443 7A0904F6D182B81BEFE0DEDAFEC974494672627B cert=a5/IlZMnDvb8d92LTHMfsBIgL7QlDLPiXiLwe85uedC80mGD0QerygzmsWnMEdwG9ER9Eg iat-mode=0 --obfs4 79.136.160.201:46501 66AC975BF7CB429D057AE07FC0312C57D61BAEC1 cert=dCtn9Ya8z+R8YQikdWgC3XTAt58z5Apnm95QHrJwnhFSdnphPPEz+NMm6OawWc2srKLjJg iat-mode=0 --obfs4 94.242.249.2:58809 6AF3024788A7EA8F84E3FA3F60018B62291803E4 cert=X0sDCJLKMM/EISdGDEfGrsks41UYmScjIIXQ9AZgWFVKNKS6klcNEpdF4tNXFz6kIyk4Ug iat-mode=0 --obfs4 35.203.134.33:2224 15524C683CC872C8C8FB5B779A8D53F54F7ADCD4 cert=bXLTv0Kwt1zgPBoeVF86vC+0tYAHepR7+QMczhhTQw9hpAIhatt/Bpe6rSGY63Zh8aZ+dQ iat-mode=0 --obfs4 188.166.252.228:9443 595770328CA95E39FF5B81013880B46CA1B29546 cert=3PjhGUq3xWDMrBAzbV1eU4zPSB3GRGBpYdXQEs9hkrwC9RSZdnEe1P+cg7VgLgYTj/2MMg iat-mode=0 -+obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -+obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -+obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED -+obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A -+obfs4 37.218.240.34:40035 88CD36D45A35271963EF82E511C8827A24730913 cert=eGXYfWODcgqIdPJ+rRupg4GGvVGfh25FWaIXZkit206OSngsp7GAIiGIXOJJROMxEqFKJg iat-mode=1 -+obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 -+obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 -+obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0 -+obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0 -+obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0 - meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com --- -2.11.0 - diff --git a/projects/orbot/0015-dependencies.patch b/projects/orbot/0015-dependencies.patch deleted file mode 100644 index 1102538..0000000 --- a/projects/orbot/0015-dependencies.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/app/build.gradle b/app/build.gradle -index 3051dd5c..ef178e91 100644 ---- a/app/build.gradle -+++ b/app/build.gradle -@@ -76,12 +76,16 @@ android { - dependencies { - // implementation 'com.github.delight-im:Android-Languages:v1.0.1' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' -- implementation project(':orbotservice') - // Match Fennec's ANDROID_SUPPORT_LIBRARY_VERSION - implementation 'com.android.support:design:23.4.0' - implementation 'pl.bclogic:pulsator4droid:1.0.3' - // These require higher versions of ANDROID_SUPPORT_LIBRARY_VERSION - //implementation 'com.github.apl-devs:appintro:v4.2.2' - //implementation 'com.github.javiersantos:AppUpdater:2.6.4' -+ implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) -+ implementation 'com.android.support:appcompat-v7:23.4.0' -+ implementation 'net.freehaven.tor.control:jtorctl:0.2' -+ implementation 'org.slf4j:slf4j-api:1.7.25' -+ implementation 'org.slf4j:slf4j-android:1.7.25' - - } -diff --git a/settings.gradle b/settings.gradle -index 9984a03e..e7b4def4 100644 ---- a/settings.gradle -+++ b/settings.gradle -@@ -1,2 +1 @@ --include ':jsocksAndroid', ':orbotservice' - include ':app' diff --git a/projects/orbot/build b/projects/orbot/build deleted file mode 100644 index 9d0d423..0000000 --- a/projects/orbot/build +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -output_dir=[% dest_dir %]/[% c('filename') %] -gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] -export GRADLE_MAVEN_REPO="file://$gradle_repo" - -# The download script assumes artifact package name is the complete URL path. -# In some cases this is incorrect, so copy those artifacts to correct location -cp -r $gradle_repo/dl/android/maven2/* $gradle_repo -cp -r $gradle_repo/plugins-release/* $gradle_repo -cp -r $gradle_repo/maven2/* $gradle_repo - -mkdir -p /var/tmp/build $output_dir - -[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] -tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz - -# Patch projects -cd /var/tmp/build/[% project %]-[% c('version') %] -for p in $rootdir/*.patch - do patch -p1 < $p -done - -mkdir app/libs -cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/*.aar app/libs/ -cp $rootdir/[% c('input_files_by_name/topl') %]/* app/libs/ - -# Build Android Libraries and Apps -$GRADLE_HOME/gradle-4.1/bin/gradle --offline assembleRelease -x lint - -# Remove these classes so we don't have problem with duplicates later in the build -orbot_apk=app/build/outputs/aar/Orbot-*.aar -unzip $orbot_apk classes.jar -d . -zip classes.jar --delete "com/runjva/*" "com/msopentech/*" "org/torproject/android/service/*" -zip -r $orbot_apk classes.jar - -# Package -cp $orbot_apk $output_dir diff --git a/projects/orbot/config b/projects/orbot/config deleted file mode 100644 index 0f72ecf..0000000 --- a/projects/orbot/config +++ /dev/null @@ -1,52 +0,0 @@ -# vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -filename: 'orbot-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: '[% c("var/orbot_version") %]-tor-[% c("var/tor_version") %]' -git_url: https://git.torproject.org/orbot.git - -var: - tor_version: 0.3.4.9 - orbot_version: 16.0.5-RC-1 - deps: - - build-essential - - autotools-dev - - unzip - - zip - container: - use_container: 1 - # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 3 - -targets: - android: - var: - arch_deps: - - openjdk-8-jdk - -input_files: - - project: container-image - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - - project: tor-android-service - name: tor-android-service - - project: tor-onion-proxy-library - name: topl - - filename: 0001-Bug-28051-Build-Orbot-as-a-library.patch - - filename: 0002-Bug-28051-Exclude-the-AppUpdater.patch - - filename: 0003-Bug-28051-Delete-the-Onboarding-activity.patch - - filename: 0004-Bug-28051-Rename-the-Hidden-Service-content-provider.patch - - filename: 0005-Bug-28051-Cast-the-layout-elements.patch - - filename: 0006-Bug-28051-Don-t-use-Orbot-s-LocaleHelper-for-locale-.patch - - filename: 0007-Bug-28051-Rename-Orbot-s-preferences-so-they-don-t-c.patch - - filename: 0008-Bug-28051-Make-TorService-compatible-with-the-suppor.patch - - filename: 0009-Bug-28051-Change-Orbot-s-behavior-for-Tor-Browser.patch - - filename: 0010-Bug-28051-Rename-Orbot-as-Tor-Browser.patch - - filename: 0011-Bug-28051-Tell-Proguard-it-should-keep-an-unused-met.patch - - filename: 0012-Bug-28051-Escape-the-apostrophe-correctly.patch - - filename: 0013-Bug-28051-Add-a-notification-compatibility-class.patch - - filename: 0014-Bug-29794-Update-built-in-bridges.patch - - filename: 0015-dependencies.patch - - filename: set_gradle_repo_to_local.patch - - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' - name: gradle-dependencies - exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/projects/orbot/gradle-dependencies-list.txt b/projects/orbot/gradle-dependencies-list.txt deleted file mode 100644 index c3fb2ef..0000000 --- a/projects/orbot/gradle-dependencies-list.txt +++ /dev/null @@ -1,193 +0,0 @@ -# On how to update dependencies see projects/common/how-to-create-gradle-dependencies-list.txt -# Don't forget to update var/gradle_dependencies_version when modifying this file -sha256sum | url -54b34e941b8e1414bd3e40d736efd3481772dc26db3296f6aa45cec9f6203d86 | https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-code… -949246020c08a0543389082af38268cdce4ee7a7a8218097369b9845752866cb | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/… -feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305… -b677d99c309dc272f60cefa1f1b639ab750d592ded0ea7bfc9f9c5600ebd742d | https://repo1.maven.org/maven2/pl/bclogic/pulsator4droid/1.0.3/pulsator4dro… -b2b5dd46cf998fa626eb6f8a1c114f6167c8d392694164e62533e5898e9b31f2 | https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom -a34658f5c5de4b573eef21131cc32cc25f7b66407944f312b28ec2e56abb1fa9 | https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.… -8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… -905721a0eea90a81534abb7ee6ef4ea2e5e645fa1def0a5cd88402df1b46c9ed | https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305… -c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar -e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom… -cc6a41dc3eaacc9e440a6bd0d2890b20d36b4ee408fe2d67122f328bb6e01581 | https://repo1.maven.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.jar -f264dd9f79a1fde10ce5ecc53221eff24be4c9331c830b7d52f2f08a7b633de2 | https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar -d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23… -6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://repo1.maven.org/maven2/org/codehaus/codehaus-parent/4/codehaus-pare… -1158e94c7de4da480873f0b4ab4a1da14c0d23d4b1902cc94a58a6f0f9ab579e | https://repo1.maven.org/maven2/com/google/guava/guava/22.0/guava-22.0.jar -7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca | https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-… -5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.… -362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/h… -23e6d006f7d07bb43ebc80b2e530c8cdd65bbabcaaf911c3f12e2ea26167178c | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core… -3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://repo1.maven.org/maven2/org/apache/httpcomponents/project/7/project-… -cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_parent/2.0… -f0c98c571e93a7cb4dd18df0fa308f0963e7a0620ac2d4244e61e709d03ad6be | https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2o… -401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://repo1.maven.org/maven2/org/antlr/antlr4-master/4.5.3/antlr4-master-… -932e6bab9a24a7bc958bbdb7e29e04d083b473d11c4ba3fab1e9b7149579f272 | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-parent/3.0.0/pr… -2a0475c2625fc27f80d3c5021130509b4068e0f984f2511e7a77a097de48b41d | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk… -8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-… -d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/common… -7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalc… -8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary… -58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte… -953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.p… -ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.… -efa86e5cd922f17b472fdfcae57234d8d4ac3e148b6250737dfce454af7a7a44 | https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom -e336a35a1e102c2f11ce1ea7f0872df14e332374b8eacc0877e50f85f84c3d09 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector… -965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-1… -2994a7eb78f2710bd3d3bfb639b2c94e219cedac0d4d084d516e78c16dddecf6 | https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2o… -e767a1248adb4843110457e839e504c2511649ee78f05a6a311ea7f23578894d | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes… -ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar -c4828e28d7c0a930af9387510b3bada7daa5c04d7c25a75c7b8b081f1c257ddd | https://repo1.maven.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.jar -b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.p… -e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/com… -47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/j… -e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://repo1.maven.org/maven2/com/android/tools/build/transform-api/2.0.0-… -6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… -9466512cd8cf0bd66a8a3661685373f7b3deafded11096e044926ff5c82c7a4c | https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.jar -1d2e883717b8ab7d3fcc9fa01034d165809a9c94daa6303a838f11e4d36adc86 | https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard… -fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/22/commons… -38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… -74fa208043740642f7e6eb09faba15965218ad2f50ce3020efb100136e4b591c | https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.j… -ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://repo1.maven.org/maven2/org/jetbrains/annotations/13.0/annotations-1… -ce6f913cad1f0db3aad70186d65c5bc7ffcc9a99e3fe8e0b137312819f7c362f | https://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/common… -59970f2f0cfce6487b7180d7de653d904d8160fb2cd9d8aba6c375d39fec6652 | https://repo1.maven.org/maven2/pl/bclogic/pulsator4droid/1.0.3/pulsator4dro… -e7a7a5810829dee924cec654a569a48301fcedd487f7b88710e816d127385f51 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… -9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://repo1.maven.org/maven2/org/apache/apache/16/apache-16.pom -43edcc0fc3bd8520bf60066f54088f272e39aa856d25cdd6ca9ee4d8f5c32666 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-… -c3c99bf58182889fe86315e9a01473ee2c95540b9dedef898cec64554d925c54 | https://repo1.maven.org/maven2/com/android/tools/annotations/24.5.0/annotat… -aeb197158a2fb6bd2cb9233e22874f8051f82891dbd82b6b089f49e309f82e40 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/… -7a3554c605e088e7e323b1084656243f0444fa353e2f2dee1f1a4204eb64ff09 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262… -d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23… -d49d179f707d3f3a00b2a7d36136b54aa8d44fa22770703cd82fe52fb39e22eb | https://repo1.maven.org/maven2/com/android/tools/build/transform-api/2.0.0-… -e899e02ec8ac6a73fb9c9c7cb9ebd9bfc4ce8263412285d5ec6f2df920880905 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod… -b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.5/htt… -26c5856e954b5f864db76f13b86919b59c6eecf9fd930b96baa8884626baf2f5 | https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simp… -fcfb09fb0ea0aa97d3cfe7ea792398081348e468f126b3603cb3803f240197f0 | https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5… -ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.20150226212… -4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.… -467ae650442e876867379094e7518dfdd67d22c5352ebd39808c84259e9790ba | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/25/commons… -f26bdec2b9496470c0ce63b0d290816e8000ef018daaa259597ebae947fd690f | https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/progua… -8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-tes… -e2b4935e76d91b5abec44de309f2c8bb8d1d2e6cc0b8790b43cb654f1e22c722 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl… -cb4cfad870bf563a07199f3ebea5763f0dec440fcda0b318640b1feaa788656b | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation… -567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7… -a06e35d3fff3a6b813d94894ebf3e498f9540c864c5b39ae783907e3a6c72889 | https://repo1.maven.org/maven2/commons-codec/commons-codec/1.6/commons-code… -8bd632c00bdf80a7de36c22b60f12452c147d8eca2f00d79d66699ebe7daa02a | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/5/commons-… -d2da399a9967c69f0a21739256fa79d284222c223082cacadc17372244764b54 | https://repo1.maven.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.jar -2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations… -52b6fd2eaf2240e14dbe752f1fa884270cc668d6f350e8e7f65f6033a8172d69 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-cli… -2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.12/com… -6b5ad911a13a5c814c04be4376586eec15838158cb59b9f062ae138ddff1b861 | https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutl… -31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.1/httpm… -2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons… -757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://repo1.maven.org/maven2/com/googlecode/juniversalchardet/juniversalc… -4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://repo1.maven.org/maven2/org/apache/apache/9/apache-9.pom -bcb7ce66a9c629fa7c723a767b6430e1a383e8d4dd543d603dcb0ad1b855b8b2 | https://dl.google.com/dl/android/maven2/com/android/support/animated-vector… -db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpmime/4.1/httpm… -fbd7b254e02d8aef60c418a5f0e14a783b38a16162caffb2d2a16ccd5d2c09b4 | https://repo1.maven.org/maven2/org/slf4j/slf4j-android/1.7.25/slf4j-android… -27b4e5c0b80d3ff8b92f4c93b3b4d3ecf16c01589f4cdf70ca7cf64cb42d8122 | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons… -81120db4d5490c4f0e9789e1178d2bac231fcff2618bd80f8ef6ff03c550d59b | https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.… -bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-me… -97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.… -a20fb26c8de5b0ff7a3069e681fcf01ebefd2f3d24b832c3af22d981d7d4376b | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1… -45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://repo1.maven.org/maven2/com/android/tools/external/lombok/lombok-ast… -321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://repo1.maven.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-… -9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://repo1.maven.org/maven2/org/apache/apache/4/apache-4.pom -cd6db17a11a31ede794ccbd1df0e4d9750f640234731f21cff885a9997277e81 | https://repo1.maven.org/maven2/com/google/google/1/google-1.pom -cf7e3630e1929ddeffcb0315db2acb37182c92dd3af970111b6115592f64d077 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.core/0.7.4.20150226212… -f4778bb3abf2df40bfa365d00ff301b5eec76f2933b85f6aa3918e2ab6f08b91 | https://dl.google.com/dl/android/maven2/com/android/support/design/23.4.0/d… -f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.14… -9144127192d6f612c2366825dceaeb23b0d53130b83e0bf1ffe107d1470a8487 | https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotation… -f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/h… -21bb4d44dff54e33a37c11af69859a714202ae00969aab5453eba7276688f8ec | https://repo1.maven.org/maven2/org/apache/httpcomponents/project/4.1.1/proj… -f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/progua… -18f5c52120db036e88d6136f8839c832d074bdda95c756c6f429249d2db54ac6 | https://repo1.maven.org/maven2/org/slf4j/slf4j-parent/1.7.25/slf4j-parent-1… -2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb… -bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://repo1.maven.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom -a32de739cfdf515774e696f91aa9697d2e7731e5cb5045ca8a4b657f8b1b4fb4 | https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.jar -0c0e9d1857c250d1d71b5c6be7b8cc29afe55e7419a90d13bbe968ae5bd7240e | https://repo1.maven.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom -1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.… -f2885288839f82f824a0c042922ae7f24ed0d55ce26a74b6a7c557e0b7e30c24 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/k… -31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685 | https://repo1.maven.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom -ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://repo1.maven.org/maven2/org/apache/apache/13/apache-13.pom -1917871c8deb468307a584680c87a44572f5a8b0b98c6d397fc0f5f86596dbe7 | https://repo.spring.io/plugins-release/org/jetbrains/trove4j/trove4j/201608… -07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.… -7e8bdca281bdcb6dad48a80854837f1c0ab46f31a0b292370e320f471f5b9cfd | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1… -bd9b9cb1a3987b1427f7a18babe7f92078e32bbe2e1dca6dced00cc0e3a077a9 | https://repo1.maven.org/maven2/org/slf4j/slf4j-android/1.7.25/slf4j-android… -b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/com… -668eb6aeb3d038267e719deb55f38a4233a12602afb97e89da609c095394400a | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.… -ecd46dc69f5212b35eb21d64db68072f956c000083030ff53e09d1f81487c580 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb… -7af7e2d8b24b4798f04c2b7da24c9fbd1b7557b4e017c2054481565916079092 | https://repo1.maven.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simp… -2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvli… -cd36b31f1495f4fe55a936dd00607abdd945e1f8074549225a04c402d1d35750 | https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.… -b787d574c851505e76212968b9ae1641ea79804aef7f5a2cee2a01cd4055213a | https://repo1.maven.org/maven2/org/apache/commons/commons-compress/1.12/com… -d48935ae1641774e03ce24b0b3f7aeee66931a1e5d9ad4d47b5f93d237ea07fb | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons… -f8fd874c37c89d5dfe5ec8190d94626512bd36ab2c2ac9d4b67515c5bee745cb | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/k… -c71555751e57e0ef912870e8ac9625ae782502a6a5b9c19ccf83b2a97d8b26bd | https://repo1.maven.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-pare… -150021a89ae6f252415cbfff5c3111bf87433776b997b68e6e71f37e5b696799 | https://dl.google.com/dl/android/maven2/com/android/support/support-vector-… -fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4… -9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-… -87cd27e1a02a5c3eb6d85059ce98696bb1b44c2b8b650f0567c86df60fa61da7 | https://repo1.maven.org/maven2/org/apache/commons/commons-parent/39/commons… -df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… -5dc327c690d031a11aa8f9f4cdc391fb938fbb7c7c143cc4bc60dd573d1fd1c9 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0… -052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-me… -13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/… -fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.… -536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://repo1.maven.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-… -70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvli… -5f1d5eab6940ece3ebb73691d8a60434d8d1e330176442be8f35a1585345b2ec | https://dl.google.com/dl/android/maven2/com/android/support/design/23.4.0/d… -0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core… -f056ed61a281b3e230a63e4abf510c0d2f9bf7ff513cacb65a29538ba90ab177 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.build/0.7.4.2015022621… -1a56992fc50f838fd091b6b9701b30da64b00bd2fe76ad2c800212eb459b49e2 | https://repo1.maven.org/maven2/com/google/code/gson/gson/2.3/gson-2.3.pom -8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://repo1.maven.org/maven2/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom -a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.… -85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 | https://repo1.maven.org/maven2/org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom -6f52ba933a117bd67131b281214510ea30232b9807bfe569bc0c17e6a2d4018c | https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1… -2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://repo1.maven.org/maven2/com/googlecode/json-simple/json-simple/1.1/j… -c9a55463942128f0b7fad62b8bee5886d1cb1c733fb3b78507465b025e6a4031 | https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCom… -1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations… -81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.… -47be4ebd35a100945bac20b2efba158fe032520229a73bc060ac57986d132dfa | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons… -18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79 | https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.… -ec3a75bebddbf19ff56a281cf5d1ad146169dcaa0e69d7b14f4aaba2e7775f34 | https://repo.spring.io/plugins-release/net/freehaven/tor/control/jtorctl/0.… -803be394edb8dd7d1e678683ed85aee7f86a172c90f03e6198c8a49d4f342b99 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0… -e1abd7f1116cf5e0c59947693e2189208ec94296b2a3394c959e3511d399a7b0 | https://repo1.maven.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5… -e91a88dd0c5e99069b7f09d4a46b5e06f1e9c4c72fc0a8e987e25d86af480f01 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat… -1f8c906d0de98ddfa81b1ce520ee52fbd280c222383b66cba89e16eafb626001 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary… -fb5369fc7ea4b2e3cf8d6f20243f1d97f81341bf818b179cd8dbd1da7a781a21 | https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom -e51efb2ec140b2849b9880fb161cb6e30dd672368a534c1f47ab46d7f537d9ca | https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard… -7cd9d7a0b5d93dfd461a148891b43509cf403a9c7f9fb49060d3554df1c81e1e | https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.… -963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349 | https://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-… -8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://repo1.maven.org/maven2/com/android/tools/external/lombok/lombok-ast… -5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-cli… -1eaf9182e1977c1c50a70edbfbf70536398c68990bfaafc9f0e9899041201539 | https://repo1.maven.org/maven2/com/google/guava/guava-parent/22.0/guava-par… -faf82de0dc02e0c0ae327cd653f37255496b2e53fce280b3ab4cb34553a89086 | https://repo1.maven.org/maven2/com/intellij/annotations/12.0/annotations-12… -a0d002465c0f611eedaaef2b2530707d2e9fb3a5c7ed66f53c556a12f714f43a | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4… -712d7c974d20b71ce730938a3dda8d23e87cfd16500e1c1a2c9ecc2c9ff0d323 | https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.… -3369726ca2b0e3736c741ff3c22e06f707a1007ff20ccc5b5ba5d0d9a01ead30 | https://repo.spring.io/plugins-release//net/freehaven/tor/control/jtorctl/0… -164e7a9cf23a4e63bbc961f8db7d965d53d685710660a88249641f91d36f83a4 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcomponents-cor… -a9660f8b64b74f474226c70a50187d8efcac448d32ce97756f408975aa52cdaa | https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1… -10107898991129eff2042a41b1bfc2d72c4ea8e4babe429ae3aeb32c69c568de | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… -5d252585d47129cd667d96c92237383138a42edec5a8963a7dd44cd770faed91 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/… -3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://repo1.maven.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent… -0ee5f691cbbedb69969b48374d27412f821959af5d2dffbabc424b607cdbbdf6 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/… -cf251279505960889b6b281c26af0438656ebac3845e52791925cf7649cb15a6 | https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdk… -e6531a278b4f632f198a6e45b9e11de1b2b678cd5a4e0fdff442f604c2439a42 | https://repo1.maven.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262… -6d079b5abf39f323baaccc68463beef5cf2e9574f333dd749ae96753f00eb205 | https://repo1.maven.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom -9619e68f7eb36da3a28a60315f34320972badbad43749cc66712bb95b96a4ef3 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat… -a47c950c755747ca3093a05e9ec85d0e2f33cbd224909f571fe7577963a4d799 | https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/… -ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte… -a1e7d6b3efc1703c7c8f1b15ecf8757f17d0ac41f32c9a48481a5caf638c55db | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.0.0/prot… -e4c7afb8f0d7aa159318d42a011cc2c9b0525d820973cbca5318bec6c649cecc | https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.0.0/prot… -24465b2ba90dc5ed7e2c05f1c87fe4256c27df6d3cd69b6177f3cb447b05c021 | https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7… -f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://repo1.maven.org/maven2/com/intellij/annotations/12.0/annotations-12… -e2f7b17610f9f0a2b55c019b7627be3d42ec142fde1db5caf8a34dbe3bb8dbcd | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/… -63b465cc628f8c305702b12b26501cea236a3175db15b5a7356e98484aa63db5 | https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-mod… -fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo1.maven.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.p… -51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://repo1.maven.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom -e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.2.5/htt… -0288414509c625b8dd544384fbd29f502bdc8b4f86cfc26625aa23eef9fa6057 | https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/5.3.3/progua… -24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/… -5c415a9d8585200de4be1947e15291cc79f599b06249375f5c9ea22d4b2d090f | https://repo.spring.io/plugins-release/org/jetbrains/trove4j/trove4j/201608… diff --git a/projects/orbot/set_gradle_repo_to_local.patch b/projects/orbot/set_gradle_repo_to_local.patch deleted file mode 100644 index ec16ae2..0000000 --- a/projects/orbot/set_gradle_repo_to_local.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 553079b6..751ac6a3 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -3,6 +3,7 @@ buildscript { - repositories { - jcenter() - google() -+ maven { url System.getenv("GRADLE_MAVEN_REPO") } - } - dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' -@@ -15,5 +16,6 @@ allprojects { - maven { url "https://raw.githubusercontent.com/guardianproject/gpmaven/master" } - google() - maven { url 'https://jitpack.io' } -+ maven { url System.getenv("GRADLE_MAVEN_REPO") } - } - }

1 0

[tor-browser-build/maint-8.5] Pick up latest mobile translations
by gk＠torproject.org 15 May '19

15 May '19

commit 239dba4f43a3cbf634ab3ef7b4351dd4d95c35dd Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 07:57:46 2019 +0000 Pick up latest mobile translations --- projects/tba-translation/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tba-translation/config b/projects/tba-translation/config index d53760c..9dd3375 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: 342ecc5cd2ec2b0c3004fc64e0cef3956831675e +git_hash: 0a14ba0a2ad2c4cc46f926dc1a5aeaa709e270d4 version: '[% c("abbrev") %]'

1 0

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

[torbutton/master] Translations update
by gk＠torproject.org 15 May '19

15 May '19

commit 999e5a388d4710330b2637618c76be8fb663b128 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:01:25 2019 +0000 Translations update --- src/chrome/locale/ar/aboutTor.dtd | 2 ++ src/chrome/locale/bn-BD/aboutTor.dtd | 2 ++ src/chrome/locale/ca/aboutTor.dtd | 2 ++ src/chrome/locale/cs/aboutTor.dtd | 2 ++ src/chrome/locale/da/aboutTor.dtd | 2 ++ src/chrome/locale/de/aboutTor.dtd | 2 ++ src/chrome/locale/el/aboutTor.dtd | 2 ++ src/chrome/locale/es-AR/aboutTor.dtd | 2 ++ src/chrome/locale/es-ES/aboutTor.dtd | 2 ++ src/chrome/locale/eu/aboutTor.dtd | 2 ++ src/chrome/locale/fa/aboutTor.dtd | 2 ++ src/chrome/locale/fr/aboutTor.dtd | 2 ++ src/chrome/locale/ga-IE/aboutTor.dtd | 2 ++ src/chrome/locale/he/aboutTor.dtd | 2 ++ src/chrome/locale/hu/aboutTor.dtd | 2 ++ src/chrome/locale/id/aboutTor.dtd | 2 ++ src/chrome/locale/is/aboutTor.dtd | 2 ++ src/chrome/locale/it/aboutTor.dtd | 2 ++ src/chrome/locale/ja/aboutTor.dtd | 2 ++ src/chrome/locale/ka/aboutTor.dtd | 2 ++ src/chrome/locale/ko/aboutTor.dtd | 2 ++ src/chrome/locale/nb-NO/aboutTor.dtd | 2 ++ src/chrome/locale/nl/aboutTor.dtd | 2 ++ src/chrome/locale/pl/aboutTor.dtd | 2 ++ src/chrome/locale/pt-BR/aboutTor.dtd | 2 ++ src/chrome/locale/ru/aboutTor.dtd | 2 ++ src/chrome/locale/sv-SE/aboutTor.dtd | 2 ++ src/chrome/locale/tr/aboutTor.dtd | 2 ++ src/chrome/locale/vi/aboutTor.dtd | 2 ++ src/chrome/locale/zh-CN/aboutTor.dtd | 2 ++ src/chrome/locale/zh-TW/aboutTor.dtd | 2 ++ 31 files changed, 62 insertions(+) diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd index 16702c40..6f8460d3 100644 --- a/src/chrome/locale/ar/aboutTor.dtd +++ b/src/chrome/locale/ar/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "احصل على آخر أخبار تور مباشرة على بريدك"> <!ENTITY aboutTor.newsletter.link_text "اشترك للحصول على أخبار تور."> +<!ENTITY aboutTor.donationBanner.line2e "حافظ على قوة تور."> +<!ENTITY aboutTor.donationBanner.buttonA "تبرع الآن"> diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd index 7d40f0d0..76bc83da 100644 --- a/src/chrome/locale/bn-BD/aboutTor.dtd +++ b/src/chrome/locale/bn-BD/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "টর থেকে পাওয়া সর্বশেষ সব খবর সরাসরি আপনার ইনবক্সে দেখুন।"> <!ENTITY aboutTor.newsletter.link_text "টর নিউজ-এর জন্য সাইন আপ করুন ।"> +<!ENTITY aboutTor.donationBanner.line2e "টরকে শক্তিশালী রাখুন। "> +<!ENTITY aboutTor.donationBanner.buttonA "এখুনি দান করুন! "> diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd index 1de2ee85..fd501f7b 100644 --- a/src/chrome/locale/ca/aboutTor.dtd +++ b/src/chrome/locale/ca/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obteniu les darreres novetats de Tor directament a la safata d'entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscriviu-vos a les noticies de Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Fes que Tor segueixi fort."> +<!ENTITY aboutTor.donationBanner.buttonA "Fes una donació"> diff --git a/src/chrome/locale/cs/aboutTor.dtd b/src/chrome/locale/cs/aboutTor.dtd index 860aa13c..06e411e5 100644 --- a/src/chrome/locale/cs/aboutTor.dtd +++ b/src/chrome/locale/cs/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Nechte si posílat nejnovější informace o Toru."> <!ENTITY aboutTor.newsletter.link_text "Přihlaste se k odběru zpravodaje Toru."> +<!ENTITY aboutTor.donationBanner.line2e "Pomozte Toru sílit."> +<!ENTITY aboutTor.donationBanner.buttonA "Přispějte"> diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd index 499fa13a..6fba4caf 100644 --- a/src/chrome/locale/da/aboutTor.dtd +++ b/src/chrome/locale/da/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de seneste nyheder fra Tor direkte i din indbakke."> <!ENTITY aboutTor.newsletter.link_text "Tilmeld Tor-nyheder."> +<!ENTITY aboutTor.donationBanner.line2e "Hold Tor stærk."> +<!ENTITY aboutTor.donationBanner.buttonA "Donér nu"> diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd index dcb397ef..1263d928 100644 --- a/src/chrome/locale/de/aboutTor.dtd +++ b/src/chrome/locale/de/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Erhalte die neuesten Nachrichten von Tor direkt in den Posteingang."> <!ENTITY aboutTor.newsletter.link_text "Tor-Nachrichten abonnieren."> +<!ENTITY aboutTor.donationBanner.line2e "Mache Tor stark."> +<!ENTITY aboutTor.donationBanner.buttonA "Spende jetzt"> diff --git a/src/chrome/locale/el/aboutTor.dtd b/src/chrome/locale/el/aboutTor.dtd index b5f39d50..1d23b6bb 100644 --- a/src/chrome/locale/el/aboutTor.dtd +++ b/src/chrome/locale/el/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Λάβετε τα τελευταία νέα του Tor κατευθείαν στα εισερχόμενα σας."> <!ENTITY aboutTor.newsletter.link_text "Εγγραφτείτε για τα νέα του Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Διατηρήστε το Tor ισχυρό."> +<!ENTITY aboutTor.donationBanner.buttonA "Κάντε μια δωρεά τώρα!"> diff --git a/src/chrome/locale/es-AR/aboutTor.dtd b/src/chrome/locale/es-AR/aboutTor.dtd index ec4cb73f..552db139 100644 --- a/src/chrome/locale/es-AR/aboutTor.dtd +++ b/src/chrome/locale/es-AR/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibí las últimas noticias de Tor derecho en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Registrate en Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantener fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Doná ahora"> diff --git a/src/chrome/locale/es-ES/aboutTor.dtd b/src/chrome/locale/es-ES/aboutTor.dtd index 1b1fb3df..aff6157d 100644 --- a/src/chrome/locale/es-ES/aboutTor.dtd +++ b/src/chrome/locale/es-ES/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Recibe las últimas noticias de Tor directamente en tu bandeja de entrada."> <!ENTITY aboutTor.newsletter.link_text "Inscríbete en Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantén fuerte a Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona ahora."> diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd index 9ee3eb08..e73e755a 100644 --- a/src/chrome/locale/eu/aboutTor.dtd +++ b/src/chrome/locale/eu/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Get the latest news from Tor straight to your inbox."> <!ENTITY aboutTor.newsletter.link_text "Harpidetu Tor berrietara"> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Egin dohaintza orain"> diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 5cc12782..c097eb75 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "آخرین اخبار تور را در صندوق ورودی خود دریافت کنید."> <!ENTITY aboutTor.newsletter.link_text "ثبت‌نام برای اخبار تور."> +<!ENTITY aboutTor.donationBanner.line2e "تور را محکم نگه دارید."> +<!ENTITY aboutTor.donationBanner.buttonA "اکنون اهداء کنید"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ded5c16f..04cc2a61 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Obtenez les dernières nouvelles au sujet de Tor directement dans votre boîte de réception."> <!ENTITY aboutTor.newsletter.link_text "Inscrivez-vous aux nouvelles de Tor"> +<!ENTITY aboutTor.donationBanner.line2e "Assurez la robustesse de Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Faites un don maintenant"> diff --git a/src/chrome/locale/ga-IE/aboutTor.dtd b/src/chrome/locale/ga-IE/aboutTor.dtd index 8522b5cb..7f2f5d82 100644 --- a/src/chrome/locale/ga-IE/aboutTor.dtd +++ b/src/chrome/locale/ga-IE/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Faigh an nuacht is déanaí maidir le Tor i do bhosca isteach."> <!ENTITY aboutTor.newsletter.link_text "Cláraigh le Nuachtlitir Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Cuir taca le Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Tabhair síntiús airgid anois"> diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd index 471d2b8d..5f1efea6 100644 --- a/src/chrome/locale/he/aboutTor.dtd +++ b/src/chrome/locale/he/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "קבל את החדשות האחרונות מאת Tor ישירות לתיבה הנכנסת שלך."> <!ENTITY aboutTor.newsletter.link_text "הירשם עבור חדשות Tor."> +<!ENTITY aboutTor.donationBanner.line2e "שמור על Tor חזק."> +<!ENTITY aboutTor.donationBanner.buttonA "תרום עכשיו"> diff --git a/src/chrome/locale/hu/aboutTor.dtd b/src/chrome/locale/hu/aboutTor.dtd index 3b8522de..a2b39bd1 100644 --- a/src/chrome/locale/hu/aboutTor.dtd +++ b/src/chrome/locale/hu/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Kapja meg a legfrissebb Tor híreket közvetlenül email fiókjába."> <!ENTITY aboutTor.newsletter.link_text "Iratkozzon fel a Tor hírekhez."> +<!ENTITY aboutTor.donationBanner.line2e "Tartsuk a Tor-t erősnek."> +<!ENTITY aboutTor.donationBanner.buttonA "Támogasson most"> diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd index 1c265201..8e7691f7 100644 --- a/src/chrome/locale/id/aboutTor.dtd +++ b/src/chrome/locale/id/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung ke inbox Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd index e54ee49b..2ee6f8d7 100644 --- a/src/chrome/locale/is/aboutTor.dtd +++ b/src/chrome/locale/is/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Fáðu nýjustu fréttir af Tor beint í pósthólfið þitt."> <!ENTITY aboutTor.newsletter.link_text "Skráðu þig til að fá Tor-fréttir."> +<!ENTITY aboutTor.donationBanner.line2e "Höldum Tor sterku"> +<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna"> diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index fb65f139..cc32558b 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Ottieni le ultime info da Tor direttamente nella tua casella di posta elettronica."> <!ENTITY aboutTor.newsletter.link_text "Registrati alle Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Mantieni Tor forte."> +<!ENTITY aboutTor.donationBanner.buttonA "Dona Ora"> diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd index 2ba4a9f7..339848eb 100644 --- a/src/chrome/locale/ja/aboutTor.dtd +++ b/src/chrome/locale/ja/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Torからの最新ニュースを受信トレイに。"> <!ENTITY aboutTor.newsletter.link_text "Torニュースにを申し込む。"> +<!ENTITY aboutTor.donationBanner.line2e "Tor を強く保つ。"> +<!ENTITY aboutTor.donationBanner.buttonA "今すぐ寄付"> diff --git a/src/chrome/locale/ka/aboutTor.dtd b/src/chrome/locale/ka/aboutTor.dtd index bdf92b30..144ae7e5 100644 --- a/src/chrome/locale/ka/aboutTor.dtd +++ b/src/chrome/locale/ka/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "მიიღეთ სიახლეები Tor-ისგან, პირდაპირ თქვენს საფოსტო ყუთში."> <!ENTITY aboutTor.newsletter.link_text "გამოიწერეთ Tor-ის სიახლეები."> +<!ENTITY aboutTor.donationBanner.line2e "შეინარჩუნეთ Tor ძლიერი."> +<!ENTITY aboutTor.donationBanner.buttonA "გაიღეთ თანხა"> diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd index 0ae8263e..0e6b1748 100644 --- a/src/chrome/locale/ko/aboutTor.dtd +++ b/src/chrome/locale/ko/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "최신의 Tor 뉴스를 받은 편지함에 곧장 받으십시오."> <!ENTITY aboutTor.newsletter.link_text "Tor 뉴스를 구독."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/nb-NO/aboutTor.dtd b/src/chrome/locale/nb-NO/aboutTor.dtd index 8fb5ba56..1b77d88d 100644 --- a/src/chrome/locale/nb-NO/aboutTor.dtd +++ b/src/chrome/locale/nb-NO/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de siste nyhetene fra Tor rett til innboksen din."> <!ENTITY aboutTor.newsletter.link_text "Registrer deg for Tor Nyheter."> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd index db4f75ce..dc688d98 100644 --- a/src/chrome/locale/nl/aboutTor.dtd +++ b/src/chrome/locale/nl/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste nieuws van Tor direct in uw postvak."> <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Houdt Tor sterk."> +<!ENTITY aboutTor.donationBanner.buttonA "Geef Nu"> diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd index dbade396..b2d905f9 100644 --- a/src/chrome/locale/pl/aboutTor.dtd +++ b/src/chrome/locale/pl/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Otrzymuj najnowsze newsy o Tor, prosto do swojej skrzynki."> <!ENTITY aboutTor.newsletter.link_text "Zapisz się na Tor News."> +<!ENTITY aboutTor.donationBanner.line2e "Utrzymuj Tor silnym."> +<!ENTITY aboutTor.donationBanner.buttonA "Wesprzyj teraz"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 5199560f..62792d16 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -29,3 +29,5 @@ <!ENTITY aboutTor.newsletter.tagline "Receba as últimas notícias do Tor diretamente na sua caixa de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Inscreva-se para receber Notícias do Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Manter a força do Tor."> +<!ENTITY aboutTor.donationBanner.buttonA "Doar Agora"> diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd index 981cc3b6..fddd66c7 100644 --- a/src/chrome/locale/ru/aboutTor.dtd +++ b/src/chrome/locale/ru/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Получайте последние новости Tor прямо на ваш почтовый ящик."> <!ENTITY aboutTor.newsletter.link_text "Подпишитесь на новости Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Сохраните Tor сильным."> +<!ENTITY aboutTor.donationBanner.buttonA "Пожертвовать"> diff --git a/src/chrome/locale/sv-SE/aboutTor.dtd b/src/chrome/locale/sv-SE/aboutTor.dtd index 68aa9bc5..d403bb76 100644 --- a/src/chrome/locale/sv-SE/aboutTor.dtd +++ b/src/chrome/locale/sv-SE/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Få de senaste nyheterna från Tor direkt till din inkorg."> <!ENTITY aboutTor.newsletter.link_text "Anmäl dig till Tor-nyheter."> +<!ENTITY aboutTor.donationBanner.line2e "Håll Tor stark."> +<!ENTITY aboutTor.donationBanner.buttonA "Donera nu"> diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index 9e540252..e11d658c 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Tor ile ilgili son gelişmeler doğrudan e-posta kutunuza gelsin."> <!ENTITY aboutTor.newsletter.link_text "Tor Haber Bültenine Abone Olun"> +<!ENTITY aboutTor.donationBanner.line2e "Tor uygulamasının gücünü koruyalım."> +<!ENTITY aboutTor.donationBanner.buttonA "Bağış Yapın"> diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd index 179102fb..c43ce61d 100644 --- a/src/chrome/locale/vi/aboutTor.dtd +++ b/src/chrome/locale/vi/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "Nhận thông tin mới nhất từ Tor được gửi tới hộp thư của bạn."> <!ENTITY aboutTor.newsletter.link_text "Đăng kí nhận tin tức từ Tor."> +<!ENTITY aboutTor.donationBanner.line2e "Giữ cho Tor trở nên mạnh mẽ."> +<!ENTITY aboutTor.donationBanner.buttonA "Đóng góp Ngay bây giờ"> diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd index 8c879049..33ea8eb4 100644 --- a/src/chrome/locale/zh-CN/aboutTor.dtd +++ b/src/chrome/locale/zh-CN/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "通过邮件获取 Tor 的最新消息。"> <!ENTITY aboutTor.newsletter.link_text "注册 Tor 新闻列表"> +<!ENTITY aboutTor.donationBanner.line2e "让 Tor 网络保持健壮。"> +<!ENTITY aboutTor.donationBanner.buttonA "现在就捐助"> diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd index 40cd6453..964a87e9 100644 --- a/src/chrome/locale/zh-TW/aboutTor.dtd +++ b/src/chrome/locale/zh-TW/aboutTor.dtd @@ -28,3 +28,5 @@ <!ENTITY aboutTor.newsletter.tagline "將 Tor 的最新消息直接傳送到您的收件匣。"> <!ENTITY aboutTor.newsletter.link_text "訂閱 Tor 的新資訊。"> +<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> +<!ENTITY aboutTor.donationBanner.buttonA "立刻捐款">

1 0

[torbutton/master] Release preparations for 2.1.8
by gk＠torproject.org 15 May '19

15 May '19

commit 0e3106d27be9bedea991b26a0e767bea315efa82 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 15 06:06:06 2019 +0000 Release preparations for 2.1.8 Version bump and CHANGELOG update --- src/CHANGELOG | 8 ++++++++ src/install.rdf | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 858e8f53..772975ec 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,11 @@ +2.1.8 + * Bug 30171: Don't sync cookie.cookieBehavior and firstparty.isolate + * Bug 30115: Map browser+domain to credentials to fix circuit display + * Bug 30497: Add Donate link to about:tor + * Bug 30069: Use slider and about:tor localizations on mobile + * Bug 30425: Revert armagadd-on-2.0 changes + * Translations update + 2.1.7 * Bug 30388: Make sure the updated intermediate certificate keeps working diff --git a/src/install.rdf b/src/install.rdf index 637483c3..a4c0808d 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>2.1.6</em:version> + <em:version>2.1.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-launcher/master] Merge branch 'bug_30319_v2'
by gk＠torproject.org 14 May '19

14 May '19

commit 125c745b8d6dfd04251e7ad2e610aeb539e49fd3 Merge: 864170b cce75d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 14 14:16:05 2019 +0000 Merge branch 'bug_30319_v2' src/modules/tl-bridgedb.jsm | 1 - 1 file changed, 1 deletion(-)

1 0