- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Try showing the homepage after the Distribution loads
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit b507541d50f3831c847be2104e5baec3104df2ba Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 23:44:43 2018 +0000 Bug 28640 - Try showing the homepage after the Distribution loads --- .../base/java/org/mozilla/gecko/BrowserApp.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 814b46f24295..9330a6ba9838 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3155,6 +3155,29 @@ public class BrowserApp extends GeckoApp // Don't show any onFinish actions when hiding from this Activity. mFirstrunAnimationContainer.registerOnFinishListener(null); mFirstrunAnimationContainer.hide(); + + // This is a little hacky, but this ensures about:tor (or whichever homepage + // is configured) shows when the user closes the FirstRun panels. + String homepageUrl = Tabs.getHomepage(BrowserApp.this); + + // If the homepage is already open in one of the tabs, then switch to that tab. + int homepage_index = Tabs.getInstance().isOpen(homepageUrl); + if (homepage_index != Tabs.INVALID_TAB_ID) { + Tabs.getInstance().selectTab(homepage_index); + return true; + } + + // Open in the currently selected tab by default + int tab_flags = Tabs.LOADURL_NONE; + + // If there's more than one tab open, then the user opened at least one of them. + // Don't modify their tabs and open a new tab for the homepage. + if (Tabs.getInstance().getDisplayCount() > 1) { + tab_flags = Tabs.LOADURL_NEW_TAB; + } + + Tabs.getInstance().loadUrl(homepageUrl, tab_flags); + return true; }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Uninstall torbutton in the user profile on Android
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit b2148509da11c2f9188e609edbeca386880f61cc Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:05 2018 +0000 Bug 28640 - Uninstall torbutton in the user profile on Android --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index ddd337038659..c9b01bdc7395 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,6 +1603,16 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); + // Uninstall torbutton if it is installed in the user profile on Android + if (AppConstants.platform === "android" && + id === "torbutton(a)torproject.org" && + location.name === KEY_APP_PROFILE) { + logger.debug("Uninstalling torbutton from user profile."); + location.uninstallAddon(id); + changed = true; + continue; + } + let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name});

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28640 - Reload distribution preferences on update
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 3c43ec1e862040767030bb5104c41265823ec8a5 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Nov 29 20:33:14 2018 +0000 Bug 28640 - Reload distribution preferences on update --- .../mozilla/gecko/distribution/Distribution.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index ea9534bfd741..2e2d07d58914 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,7 +43,9 @@ import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.GeckoSharedPrefs; +import org.mozilla.gecko.preferences.DistroSharedPrefsImport; import org.mozilla.gecko.Telemetry; +import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; @@ -247,6 +249,18 @@ public class Distribution { data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); + // Only overwrite the current preferences if we upgraded. + // This isn't the best behavior because if the user + // changed one of the preferences, then this overwrites + // it. What we really want is a feature where we can + // set a new preference if the current value wasn't + // user-modified. This implementation doesn't support + // something like that. #28842 + final SharedPreferences settings = distribution.getSharedPreferences(); + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + DistroSharedPrefsImport.importPreferences(distribution.context, distribution); + } + } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); } @@ -498,6 +512,13 @@ public class Distribution { // We've done the work once; don't do it again. if (this.state == STATE_SET) { + // If this is a new version of the app, then copy the + // distribution files from the APK + if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { + Log.i(LOGTAG, "Copying APK distribution file because the build ID changed."); + copyAndCheckAPKDistribution(); + } + // Note that we don't compute the distribution directory. // Call `ensureDistributionDir` if you need it. runReadyQueue();

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 394819bf1afed389183714579d3d7ebafea0c0c0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 19:58:24 2018 +0000 Revert "Bug 28640: Do not load Torbutton from the user's profile (only on Android)" This reverts commit 228b36c63fa089ce37d2713fc7b095dacdb9b338. --- toolkit/mozapps/extensions/internal/XPIProvider.jsm | 11 ----------- toolkit/mozapps/extensions/internal/moz.build | 5 +---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index 41391d2d6c51..ddd337038659 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -1603,17 +1603,6 @@ var XPIStates = { for (let [id, file] of location.getAddonLocations(true)) { knownIds.delete(id); -#if defined(TOR_BROWSER_VERSION) && defined(ANDROID) - // Remove Torbutton if it is installed in the user profile - if (id === "torbutton(a)torproject.org" && - location.name === KEY_APP_PROFILE) { - logger.debug("Uninstalling Torbutton from user profile."); - location.uninstallAddon(id); - changed = true; - continue; - } -#endif - let xpiState = loc.get(id); if (!xpiState) { logger.debug("New add-on ${id} in ${location}", {id, location: location.name}); diff --git a/toolkit/mozapps/extensions/internal/moz.build b/toolkit/mozapps/extensions/internal/moz.build index 32b75a5cef68..8661ef7125dd 100644 --- a/toolkit/mozapps/extensions/internal/moz.build +++ b/toolkit/mozapps/extensions/internal/moz.build @@ -15,11 +15,8 @@ EXTRA_JS_MODULES.addons += [ 'ProductAddonChecker.jsm', 'SpellCheckDictionaryBootstrap.js', 'XPIInstall.jsm', - 'XPIProviderUtils.js', -] - -EXTRA_PP_JS_MODULES.addons += [ 'XPIProvider.jsm', + 'XPIProviderUtils.js', ] TESTING_JS_MODULES += [

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Try showing the homepage after the distribution loads"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 955bb4e6e38b83a474600a112182ac64ed6aba56 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:04:06 2018 +0000 Revert "Bug 28640: Try showing the homepage after the distribution loads" This reverts commit ae00e455712e51453730ced526dc71dac9893344. --- .../base/java/org/mozilla/gecko/BrowserApp.java | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index 9330a6ba9838..814b46f24295 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -3155,29 +3155,6 @@ public class BrowserApp extends GeckoApp // Don't show any onFinish actions when hiding from this Activity. mFirstrunAnimationContainer.registerOnFinishListener(null); mFirstrunAnimationContainer.hide(); - - // This is a little hacky, but this ensures about:tor (or whichever homepage - // is configured) shows when the user closes the FirstRun panels. - String homepageUrl = Tabs.getHomepage(BrowserApp.this); - - // If the homepage is already open in one of the tabs, then switch to that tab. - int homepage_index = Tabs.getInstance().isOpen(homepageUrl); - if (homepage_index != Tabs.INVALID_TAB_ID) { - Tabs.getInstance().selectTab(homepage_index); - return true; - } - - // Open in the currently selected tab by default - int tab_flags = Tabs.LOADURL_NONE; - - // If there's more than one tab open, then the user opened at least one of them. - // Don't modify their tabs and open a new tab for the homepage. - if (Tabs.getInstance().getDisplayCount() > 1) { - tab_flags = Tabs.LOADURL_NEW_TAB; - } - - Tabs.getInstance().loadUrl(homepageUrl, tab_flags); - return true; }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640 - Push notifications are disabled, so don't clear them"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 0b36c3e8a59bf675ac6bd1ae36d38f16c4748884 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 20:05:58 2018 +0000 Revert "Bug 28640 - Push notifications are disabled, so don't clear them" This reverts commit 1d5d94a68d95f675c108f377a1b9e02ee16b15bb. --- mobile/android/modules/Sanitizer.jsm | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 2940dd81b217..3782c92172f9 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,23 +124,18 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - // Avoid throwing an error because nsIPushService isn't implemented yield new Promise((resolve, reject) => { - reject(new Error("Error clearing push subscriptions")); + let push = Cc["@mozilla.org/push/Service;1"] + .getService(Ci.nsIPushService); + push.clearForDomain("*", status => { + if (Components.isSuccessCode(status)) { + resolve(); + } else { + reject(new Error("Error clearing push subscriptions: " + + status)); + } + }); }); - - //yield new Promise((resolve, reject) => { - // let push = Cc["@mozilla.org/push/Service;1"] - // .getService(Ci.nsIPushService); - // push.clearForDomain("*", status => { - // if (Components.isSuccessCode(status)) { - // resolve(); - // } else { - // reject(new Error("Error clearing push subscriptions: " + - // status)); - // } - // }); - //}); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }),

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Bug 28507 - Don't call Push and Sync services during Sanitize
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit a3754ec3a532e489207ce12781a4b6fb5a1daa37 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Nov 30 04:51:05 2018 +0000 Bug 28507 - Don't call Push and Sync services during Sanitize --- mobile/android/modules/Sanitizer.jsm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/mobile/android/modules/Sanitizer.jsm b/mobile/android/modules/Sanitizer.jsm index 3782c92172f9..6b26e709df0a 100644 --- a/mobile/android/modules/Sanitizer.jsm +++ b/mobile/android/modules/Sanitizer.jsm @@ -124,18 +124,9 @@ Sanitizer.prototype = { sss.clearAll(); // Clear push subscriptions - yield new Promise((resolve, reject) => { - let push = Cc["@mozilla.org/push/Service;1"] - .getService(Ci.nsIPushService); - push.clearForDomain("*", status => { - if (Components.isSuccessCode(status)) { - resolve(); - } else { - reject(new Error("Error clearing push subscriptions: " + - status)); - } - }); - }); + // Avoid throwing an error because Ci.nsIPushService isn't implemented + // All other clearing actions should succeed if we arrive here. + Promise.resolve(); TelemetryStopwatch.finish("FX_SANITIZE_SITESETTINGS", refObj); }), @@ -344,11 +335,8 @@ Sanitizer.prototype = { }, canClear: function(aCallback) { - Accounts.anySyncAccountsExist().then(aCallback) - .catch(function(err) { - Cu.reportError("Java-side synced tabs clearing failed: " + err); - aCallback(false); - }); + // We can't clear syncedTabs because Sync is non-functional + aCallback(false); } }

1 0

[tor-browser/tor-browser-60.4.0esr-8.5-1] Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed"
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 8b78836cdad4d4b81f2b76c5ac4d62c42fda8049 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Dec 14 19:59:33 2018 +0000 Revert "Bug 28640: Reload distribution preferences when a new version of the app is installed" This reverts commit 35d8c07dbf9a8f4e78a00513374d97267b90958c. --- .../base/java/org/mozilla/gecko/distribution/Distribution.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java index 93c325e451bd..ea9534bfd741 100644 --- a/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java +++ b/mobile/android/base/java/org/mozilla/gecko/distribution/Distribution.java @@ -43,9 +43,7 @@ import org.mozilla.gecko.EventDispatcher; import org.mozilla.gecko.GeckoAppShell; import org.mozilla.gecko.GeckoApplication; import org.mozilla.gecko.GeckoSharedPrefs; -import org.mozilla.gecko.preferences.DistroSharedPrefsImport; import org.mozilla.gecko.Telemetry; -import org.mozilla.gecko.preferences.GeckoPreferences; import org.mozilla.gecko.util.FileUtils; import org.mozilla.gecko.util.GeckoBundle; import org.mozilla.gecko.util.HardwareUtils; @@ -248,7 +246,6 @@ public class Distribution { final String preferencesJSON = FileUtils.readStringFromFile(descFile); data = new GeckoBundle(1); data.putString("preferences", preferencesJSON); - DistroSharedPrefsImport.importPreferences(distribution.context, distribution); } catch (IOException e) { Log.e(LOGTAG, "Error getting distribution descriptor file.", e); @@ -501,13 +498,6 @@ public class Distribution { // We've done the work once; don't do it again. if (this.state == STATE_SET) { - // If this is a new version of the app, then copy the - // distribution files from the APK - if (!AppConstants.MOZ_APP_BUILDID.equals(settings.getString(GeckoPreferences.PREFS_APP_UPDATE_LAST_BUILD_ID, null))) { - Log.i(LOGTAG, "Copying APK distribution file because the build ID changed."); - copyAndCheckAPKDistribution(); - } - // Note that we don't compute the distribution directory. // Call `ensureDistributionDir` if you need it. runReadyQueue();

1 0

[tor-browser-build/master] Bug 28850: Update some gradle dependencies URLs
by gk＠torproject.org 14 Dec '18

14 Dec '18

commit 361f30cf97228e232b45ba6ba202242405491e36 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 14 11:35:23 2018 +0100 Bug 28850: Update some gradle dependencies URLs --- projects/firefox/gradle-dependencies-list.txt | 16 ++++++++-------- projects/orbot/gradle-dependencies-list.txt | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/projects/firefox/gradle-dependencies-list.txt b/projects/firefox/gradle-dependencies-list.txt index da078c0..46f12c8 100644 --- a/projects/firefox/gradle-dependencies-list.txt +++ b/projects/firefox/gradle-dependencies-list.txt @@ -8,7 +8,7 @@ d46777ad3ea8bca73491b2e02fc85b3664486abf5314cc4dc6740908bd855330 | https://jcent ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c… 536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6… 32c797717189ffd0dcc2fcb2e804ab5a0d0c8dfa78b2aa78037f61d4a572f62c | https://raw.githubusercontent.com/guardianproject/gpmaven/master/org/torpro… -2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom +2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://maven.google.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom 8d4006178fedef4255797b806167cf4a6774158eedabf96420693afbbd00fee3 | https://maven.google.com/com/android/tools/analytics-library/protos/26.0.1/… c3fb02564ca173e45548d7a91aca1efe341db11da2656199d559773e7ae15edf | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.0.1/asm-commons-5.0.1… ff513db0361fd41237bef4784968bc15aae478d4ec0a9496f811072ccaf3841d | https://jcenter.bintray.com/org/apache/apache/13/apache-13.pom @@ -18,7 +18,7 @@ f09330e83f0e3a3f6648ee43a6814ee3a91df699adf7446d6f1f38e95e34cd88 | https://raw.g 8c6191e0dd8bfdc862332cb79b08185ac5b63565d405dac2605be4c2b19774bd | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.… 8b0aa8a74e990ca8d633ab7bd1938530e921548df13fd4020224a61065378876 | https://maven.google.com/com/android/tools/build/builder-test-api/3.0.1/bui… 363cc83767b760d7a564d5301e09467e6d48fc1c1c1664b1e18c50815ce19076 | https://jcenter.bintray.com/com/google/guava/guava/20.0/guava-20.0.pom -bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/… +bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… f6775dc981540ffa10f33bd831f14608517ce38b90628e045707dd5bb5d1348e | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-http-shared/1.0-be… 9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom e5e82da4cc66c8d917bbf743e3c0752efe8522735e7fc9dbddb65bccea81cfe9 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcore/4.2.5/httpco… @@ -32,7 +32,7 @@ e824935c264b041e847b67808aee704f8cd47d698203259057e42f473e1f6f30 | https://maven 0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://maven.google.com/com/android/tools/build/gradle-core/3.0.1/gradle-c… e6d920d5a1a34aaaebab1e6a82c36bbfd61f1eeaabc4534ee05d4faad56f1b7a | https://jcenter.bintray.com/org/apache/ant/ant/1.8.0/ant-1.8.0.pom 401877d5e70ad599e9b6cff18434ea0332f637b51f8ec68352646c836f9bb2a4 | https://jcenter.bintray.com/org/antlr/antlr4-master/4.5.3/antlr4-master-4.5… -b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.j… +b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.jar 58aa4df8faae90e484c0bc47494a1ec97dc51fe53eae2b4a70d60ea7489cdf8c | https://maven.google.com/com/android/tools/external/com-intellij/intellij-c… 965aeb2bedff369819bdde1bf7a0b3b89b8247dd69c88b86375d76163bb8c397 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… cf149955279b07d4f11e817985c1164a69e930d73db7441b43a6ef53bbd286c4 | https://jcenter.bintray.com/com/google/errorprone/error_prone_parent/2.0.18… @@ -60,7 +60,7 @@ d125b3ade9f694ae60ef835f5ae000b6ba35fba8c34bafd8b40a1961375e63fa | https://jcent 15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin… fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://maven.google.com/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.… e116f32edcb77067289a3148143f2c0c97b27cf9a1342f8108ee37dec4868861 | https://jcenter.bintray.com/org/apache/maven/wagon/wagon-provider-api/1.0-b… -70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar +70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://maven.google.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar 95b8b357d19f63797dd7d67622fd3f18374d64acbc6584faba1c7759a31e8438 | https://jcenter.bintray.com/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.… ee4e1227673b6ba0b462b567f011b88b6e4e4cd044e1c9734ffb1a2ff80d7ee7 | https://jcenter.bintray.com/org/robolectric/resources/3.5.1/resources-3.5.1… 857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://jcenter.bintray.com/com/getkeepsafe/dexcount/dexcount-gradle-plugin… @@ -193,7 +193,7 @@ f095c882716d49269a806685dcb256fa6a36389b2713ac56bb758bf8693565a2 | https://jcent 4a028c17c75cce301e13fdfbc0750ceb48a166dd1013ee516a49684472fcf0e5 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-android-extensions/… 1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468 | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.… 70cc10a9e0b028dd98ca870354afc45eb61eebbd5c6b247b9dd00b4af2b9279a | https://jcenter.bintray.com/org/simpleframework/simple-common/6.0.1/simple-… -07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.… +07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json… db50fbb16778e5ff47eaf46a2b63891c546911e7bde06c068ecbe9806b02c672 | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-gradle-plugin/1.1.5… a0700d84efe7cc3103557bd0522f9443681b96ba9559c4bb7f9dc9bf35243485 | https://jcenter.bintray.com/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom @@ -254,7 +254,7 @@ bfadb3b40f65dd6de1666d6b29f8bb54031396c76eeef4146cf9f28255f8bf33 | https://jcent 8ba35dd4ea1647b89a8ae082bb6c81d5695a1ec31e73aa57bfa3512069c4bee2 | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-… 91b9f17a54e6c340c8d3ea4b359401170706eb26a82d51909abe6ba80081aed8 | https://jcenter.bintray.com/com/google/code/gson/gson/2.8.2/gson-2.8.2.pom 59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.jar -052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/… +052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 258f12f1facc44d0b25b9fa2bde33a58f3de9eea412588ff47922c9cac910a5a | https://maven.google.com/com/android/support/cardview-v7/23.4.0/cardview-v7… 90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4 | https://jcenter.bintray.com/junit/junit/4.12/junit-4.12.pom d135cff96dcbbc8a5fab30180e557cae620373cf26941d4c738a88896a2d98ed | https://jcenter.bintray.com/org/apache/maven/maven/2.2.1/maven-2.2.1.pom @@ -264,7 +264,7 @@ d135cff96dcbbc8a5fab30180e557cae620373cf26941d4c738a88896a2d98ed | https://jcent f5655d331af6afcd4dbaedaa739b889380c771a7e83f7aea5c8544a05074cf0b | https://jcenter.bintray.com/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.pom 30b09c7504768820bfd8572ffcf8c2c55a668ecff6ca3e125906d00bf393a082 | https://maven.google.com/com/android/support/test/espresso/espresso-idling-… 7bc4c7f999b9c673c714f7f8adb6281b11b8f14d5821a2b860c3d60c24518c66 | https://jcenter.bintray.com/com/squareup/leakcanary/leakcanary-watcher/1.4-… -e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.p… +e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.pom 6422a1f272022e3153ed68af04e5a03548fe48061ed2846c044df84e02abb143 | https://jcenter.bintray.com/org/robolectric/junit/3.5.1/junit-3.5.1.pom 9cddda75f4a1b4469e73f44e7b61a3e897d0f657df4797f9106ffe88c4eeade0 | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6… 5fe8a11e913086fb7ab505b930987f30cfa3f4b226d4bbbc68003ca4387ae40e | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26… @@ -276,7 +276,7 @@ d7d77326867e6d903156ebb18c244819b26aebe3aa82a1c57081081a0b6c4f63 | https://jcent 567ae5af5665bb445802ca650a4dc848737c9ee564f69f2ead5df1189d394304 | https://maven.google.com/com/android/support/recyclerview-v7/23.4.0/recycle… 66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9 | https://jcenter.bintray.com/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.… ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://maven.google.com/com/android/tools/lint/lint-api/26.0.1/lint-api-26… -81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.… +81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 326ba49aa7a35e07b6cc592ad7a5b0f86f4667051a8e70e7639c54bc0c356dee | https://jcenter.bintray.com/org/jetbrains/kotlin/kotlin-stdlib/1.1.60/kotli… a219a1abf948400b669d08be73a6f9209fb720d237e5ff74c223bffe5f9df93d | https://jcenter.bintray.com/com/thoughtworks/xstream/xstream/1.4.8/xstream-… 8f10ffd8df0d3e9819c8cc8402709c6b248bc53a954ef6e45470d9ae3a5735fb | https://jcenter.bintray.com/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.pom diff --git a/projects/orbot/gradle-dependencies-list.txt b/projects/orbot/gradle-dependencies-list.txt index c0243f7..a7d14ba 100644 --- a/projects/orbot/gradle-dependencies-list.txt +++ b/projects/orbot/gradle-dependencies-list.txt @@ -80,7 +80,7 @@ d48935ae1641774e03ce24b0b3f7aeee66931a1e5d9ad4d47b5f93d237ea07fb | https://dl.go 45eb0d6e49430271b5fb385c53fae0b81d6ad3eae465a7a8d948217bcae1e86d | https://jcenter.bintray.com/com/android/tools/external/lombok/lombok-ast/0.… ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478 | https://jcenter.bintray.com/org/jetbrains/annotations/13.0/annotations-13.0… 2ba9c1cfec6b4a183b72a5ccc6cb2c83479d6ad7e931543c792292c1679a7f43 | https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetb… -052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/… +052b0d2b58e5df4f30e4f64bdf5414473f6cfa10147f8f8d89cb0b63316ba8f3 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 9f85ff2fd7d6cb3097aa47fb419ee7f0ebe869109f98aba9f4eca3f49e74a40e | https://jcenter.bintray.com/org/apache/apache/16/apache-16.pom d7e368746fa68ca6ba63519fb0838be9a278d509a5fcee6cd4a778a119eae447 | https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/23… 47be4ebd35a100945bac20b2efba158fe032520229a73bc060ac57986d132dfa | https://dl.google.com/dl/android/maven2/com/android/support/constraint/cons… @@ -102,7 +102,7 @@ db3cd95bec1001605e1653f2843e8542e712fa2bb672fd9c8c1ace86c57673d1 | https://jcent 2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json… ee032c39ae5e3cd099148fbba9a2124f9ed613e5cb93e03ee0fa8808ce364040 | https://jcenter.bintray.com/org/ow2/asm/asm-util/5.1/asm-util-5.1.jar f5a0a1eeaa100ed36aa83eca562d5dbb7e9b045c98b44db7da4745e9d9a20328 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http… -70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar +70c458dcf6040317b41ddf50a7d53a02b8a85b0723b36cde9562c59e3cd11dae | https://maven.google.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.jar 24633fb1e62a9e4b1a25e2c1751d68be89e050b488652456e545b8019539137d | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/… ee041b3beb682e8bbf2dc16b6edc233483cbc36bde27fd13996617a667b615a5 | https://dl.google.com/dl/android/maven2/com/android/tools/external/com-inte… bd94ab42c841db16fb480f4c65d33d297e544655ecc498b37c5cf33a0c5f1968 | https://dl.google.com/dl/android/maven2/com/android/support/support-annotat… @@ -115,7 +115,7 @@ f8ab13b14be080fe2f617f90e55599760e4a1b4deeea5c595df63d0d6375ed6d | https://jcent 13c1448f7ebb61f67e6fbd6cd5c188804c17c4d7e77c4b79b316ede4ef9cd9b3 | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/… b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://jcenter.bintray.com/org/sonatype/oss/oss-parent/7/oss-parent-7.pom fb8c5e55e30a7addb4ff210858a0e8d2494ed6757bbe19012da99d51586c3cbb | https://jcenter.bintray.com/org/apache/commons/commons-parent/22/commons-pa… -2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://jcenter.bintray.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom +2ec779741f72313fc6623d0f0e42b2450dd2425dd6ad319697e658aae9ae177b | https://maven.google.com/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom 321668fc474a73140eb9cc73c779f1ebb9f60948aade3beddee082ecefcf0259 | https://jcenter.bintray.com/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk… d0f2e16d054e8bb97add9ca26525eb2346f692809fcd2a28787da8ceb3c35ee8 | https://jcenter.bintray.com/commons-logging/commons-logging/1.1.1/commons-l… 8a4e4b32eedaa72976a757e12cf1dfe742725db0b7311bf176dd937ba4236384 | https://jcenter.bintray.com/org/antlr/antlr4/4.5.3/antlr4-4.5.3.pom @@ -135,20 +135,20 @@ e8b4151ae1679f1abe7a14ee371ac9b3c651ae7b63290d1f586bdd0f78face9a | https://jcent 6895e368fa59168428c78cdf300bb29352073f397d8f260af3de82df2c8b2448 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… ec4c74554312fac5116350164786f91b35c9e082fa4ea598bfa42b5db05d7abb | https://jcenter.bintray.com/org/jacoco/org.jacoco.core/0.7.4.201502262128/o… 1ef71c25a9d46ae0ce023d02a5734e0b06fdf934fbc5948e20482526b22b4179 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.… -e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.p… +e30f1db6058f745f26112ef309f89becb27c617c7d9e4c6e02165a7620a92e6a | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.pom fcd77cba4ea3893429860b93da5d43f2e089f2ba8bdfa97ef724f410f404152a | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.… 9e9323a26ba8eb2394efef0c96d31b70df570808630dc147cab1e73541cc5194 | https://jcenter.bintray.com/org/apache/apache/4/apache-4.pom 8fdc3336e7b01873193ba9c48b87de7d788dc0954d1eb45c322492627a4b5c6e | https://jcenter.bintray.com/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk… 97b3786e1f55e74bddf8ad102bf50e33bbcbc1f6b7fd7b36f0bbbb25cd4981be | https://jcenter.bintray.com/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.jar 31629566148e8a47688ae43b420abc3ecd783ed15b33bebc00824bf24c9b15aa | https://jcenter.bintray.com/org/apache/httpcomponents/httpmime/4.1/httpmime… 4f88a89142c64bf03906f84609594666e9694df56e3e6f05edfab8a68b39d837 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.… -b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://jcenter.bintray.com/com/android/tools/common/26.0.1/common-26.0.1.j… +b27bbb9d269a97be8ff0ac480c0f09c9a953f62e6ff05d90fcbb0ddb4de97c77 | https://maven.google.com/com/android/tools/common/26.0.1/common-26.0.1.jar ddb0fc5402b4cd8f31d5f29c830793d3ec00fd8ce60786254e5f0f132f0bdd8d | https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.… 47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://jcenter.bintray.com/com/googlecode/json-simple/json-simple/1.1/json… fee07b2760ef3ed20f2edefa70504a29f9216d277adae56ce85778ee4b18cd04 | https://dl.google.com/dl/android/maven2/com/android/support/support-v4/23.4… 8b870b3f2ee38bf15681acbc8b628df1ccf7c533190b5c79af9934b6cd66d451 | https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary… 0a640f956f4cdde8b5d3458a67ca67599eeb6f47349167a3f1afce7d60978027 | https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core… -81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.… +81f73f8b25b430f5a40a39727bbcef653a1d0868cc69233b44e4282ce5a94ff9 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 953b116521a73575eee990e3f2c36a892fb088bb2d9a3027c82193cb7a013ef7 | https://jcenter.bintray.com/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom 40ceb7157feb263949e0f503fe5f71689333a621021aa20ce0d0acee3badaa0f | https://jcenter.bintray.com/com/google/j2objc/j2objc-annotations/1.1/j2objc… a9d65daccc5afca97372936246ac49fb587423e005606e7981b0efc66b0e9385 | https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.… @@ -156,7 +156,7 @@ d3d96637b0e8e61046567b8c87b667dcf3cd31c7447f651cb58d6e6e744adfba | https://dl.go c0de2bbc4cb8297419659813ecd4ed1d077ed1dd5c1f5544cc5143e493e84c10 | https://jcenter.bintray.com/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.jar 3e395d6fbc43c09a3774cac8694ce527398305ea3fd5492d80e25af27d382a9c | https://jcenter.bintray.com/org/codehaus/mojo/mojo-parent/34/mojo-parent-34… 5215b648798c6c8d9b9cde3642d3bfb5a4cc894b7c8411004352e7de5d119827 | https://jcenter.bintray.com/org/apache/httpcomponents/httpcomponents-client… -bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://jcenter.bintray.com/com/android/tools/build/manifest-merger/26.0.1/… +bede73084ec812b916f686cc6e47625bd0756154bef589a4c2b419e54a393bf5 | https://maven.google.com/com/android/tools/build/manifest-merger/26.0.1/man… 536c45e8804de01321c478cfb994377f81f1e32897636616fa21b877fd137c6f | https://jcenter.bintray.com/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6… 38db692b5cbaf69d89b1fe5b0fc38a5cc83f898716f8bc64086fa17c25ea57d6 | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… f34b3a0b62cdb468eb7e8335de4edc87958dc299306c2b4ba8ea15e6a4be106a | https://jcenter.bintray.com/net/sf/proguard/proguard-gradle/5.3.3/proguard-… @@ -182,7 +182,7 @@ b6eb99f1362b8344ca5400d57a35c49e3504f23f3dee304fdb879d4d953f4bc6 | https://jcent 3d6eba428555a558de046b5d76eacc1f5a54b4f5f20b84d636ed7aff18aa48c3 | https://jcenter.bintray.com/org/apache/httpcomponents/project/7/project-7.p… 362e9324ee7c697e21279e20077b52737ddef3f1b2c1a7abe5ad34b465145550 | https://jcenter.bintray.com/org/apache/httpcomponents/httpclient/4.2.6/http… 2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6 | https://jcenter.bintray.com/org/apache/commons/commons-compress/1.12/common… -07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://jcenter.bintray.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.… +07f08b315c812406e9d497e1b592689742feb3950c1a713f95e2692d3e15b619 | https://maven.google.com/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1… 4946e60a547c8eda69f3bc23c5b6f0dadcf8469ea49b1d1da7de34aecfcf18dd | https://jcenter.bintray.com/org/apache/apache/9/apache-9.pom df5f5e4b6d2ddcde49ed5a4e7e3bf2cb7f87e0d9892e5b066f995c4d703b228f | https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library… feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://jcenter.bintray.com/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.…

1 0

[torbutton/master] Fold in stable CHANGELOG
by gk＠torproject.org 12 Dec '18

12 Dec '18

commit 5181397d7282db3ee95a2833b34b26cf5886a295 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 12 08:35:05 2018 +0000 Fold in stable CHANGELOG --- src/CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 6f5b3f3b..2c41ed83 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -5,6 +5,11 @@ * Bug 28747: Remove NoScript (XPCOM) related unused code * Translations update +2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + 2.1.2 * Bug 25013: Integrate Torbutton into tor-browser for Android * Bug 27111: Update about:tor desktop version to work on mobile

1 0