- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 28752: Don't download tor-android-binary resources during build
by gk＠torproject.org 19 Dec '18

19 Dec '18

commit 9b0b7b5159e670e04d5705350f33f8b2aa056634 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Dec 16 12:57:25 2018 -0800 Bug 28752: Don't download tor-android-binary resources during build --- projects/firefox/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/firefox/build b/projects/firefox/build index da82862..b9d9d5a 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -99,9 +99,14 @@ mv -f $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig [% IF c("var/android") %] export GRADLE_MAVEN_REPOSITORIES="file:///var/tmp/gradle-dependencies" + gradle_repo=/var/tmp/gradle-dependencies # Move Gradle Repo to hard-coded location. This location is embedded in the file # chrome/toolkit/content/global/buildconfig.html so needs to be standard for reproducibility - mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] /var/tmp/gradle-dependencies + mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo + # The download script assumes the artifact package name is the complete URL path. + # In some cases this is incorrect, so copy those artifacts to the correct location + cp -r $gradle_repo/guardianproject/gpmaven/master/* $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 # Prepare building the multi-locale .apk mkdir -p /var/tmp/dist/locales

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 - 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 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 - 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] 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: 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] 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: 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

[tor-browser-build/master] Fold in stable changelog
by gk＠torproject.org 12 Dec '18

12 Dec '18

commit 354dd671031b0f42e1133e70586699340f5fafed Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 12 08:33:23 2018 +0000 Fold in stable changelog --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bf58398..bd59467 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -27,6 +27,34 @@ Tor Browser 8.5a6 -- December 11 2018 * Bug 28696: Make path to Gradle dependencies reproducible * Bug 28697: Use pregenerated keystore and fix timestamp issues +Tor Browser 8.0.4 -- December 11 2018 + * All platforms + * Update Firefox to 60.4.0esr + * Update Tor to 0.3.4.9 + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.0.9 + * Bug 28540: Use new text for 2018 donation banner + * Bug 28515: Use en-US for english Torbutton strings + * Translations update + * Update HTTPS Everywhere to 2018.10.31 + * Update NoScript to 10.2.0 + * Bug 1623: Block protocol handler enumeration (backport of fix for #680300) + * Bug 25794: Disable pointer events + * Bug 28608: Disable background HTTP response throttling + * Bug 28185: Add smallerRichard to Tor Browser + * Windows + * Bug 26381: about:tor page does not load on first start on Windows + * Bug 28657: Remove broken FTE bridge from Tor Browser + * OS X + * Bug 26263: App icon positioned incorrectly in macOS DMG installer window + * Bug 26475: Fix Stylo related reproducibility issue + * Linux + * Bug 26475: Fix Stylo related reproducibility issue + * Bug 28657: Remove broken FTE bridge from Tor Browser + * Build System + * All Platforms + * Bug 27218: Generate multiple Tor Browser bundles in parallel + Tor Browser 8.5a5 -- December 3 2018 * All Platforms * Update Torbutton to 2.1.2

1 0

[tor-browser-build/master] Changelog fixes
by gk＠torproject.org 12 Dec '18

12 Dec '18

commit b69a9169e0c2d1a8101d16450bc73ff352d8c5d5 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 12 07:25:01 2018 +0000 Changelog fixes Thanks to a cypherpunk for mentioning the missing pointer events item on the blog. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c1a3197..bf58398 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,6 @@ Tor Browser 8.5a6 -- December 11 2018 * All Platforms * Update Firefox to 60.4.0esr - * Update OpenSSL to 1.0.2q * Update Torbutton to 2.1.3 * Bug 28540: Use new text for 2018 donation banner * Bug 27290: Remove WebGL pref for min capability mode @@ -12,8 +11,14 @@ Tor Browser 8.5a6 -- December 11 2018 * Bug 28695: Set default security.pki.name_matching_mode to enforce (3) * Bug 27290: Remove WebGL pref for min capability mode * Bug 27919: Backport SSL status API + * Bug 25794: Disable pointer events * Windows + * Update OpenSSL to 1.0.2q * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems + * OS X + * Update OpenSSL to 1.0.2q + * Linux + * Update OpenSSL to 1.0.2q * Android * Bug 26843: Multi-locale support for Tor Browser on Android * Build System

1 0

[tor-browser-build/master] Fix typos in Changelog
by gk＠torproject.org 11 Dec '18

11 Dec '18

commit f02cc1a47652ca7429ef2819aee6068fda7ac4f4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 11 15:34:36 2018 +0000 Fix typos in Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 13ab9c9..c1a3197 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -103,9 +103,9 @@ Tor Browser 8.5a4 -- October 23 2018 * Bug 28002: Fix the precomplete file in the en-US installer * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Linux - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Bug 28022: Use `/usr/bin/env bash` for bash invocation * Android * Backport of fixes for bug 1448014, 1458905, 1441345, and 1448305

1 0

[tor-browser-build/maint-8.0] Fixing typos
by gk＠torproject.org 11 Dec '18

11 Dec '18

commit 36ee87d15c7d114fc801b2cd64e99a0c530cb5d8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Dec 11 15:32:01 2018 +0000 Fixing typos --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index d347684..156b812 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -18,9 +18,9 @@ Tor Browser 8.0.4 -- December 11 2018 * Bug 28657: Remove broken FTE bridge from Tor Browser * OS X * Bug 26263: App icon positioned incorrectly in macOS DMG installer window - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Linux - * Bug 26475: Fix Stylo related reproducibilitiy issue + * Bug 26475: Fix Stylo related reproducibility issue * Bug 28657: Remove broken FTE bridge from Tor Browser * Build System * All Platforms

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_25779_v4'
by boklm＠torproject.org 10 Dec '18

10 Dec '18

commit 0512b59d0cc4c68952454e85551659742930cb6d Merge: e4a246e 54f63e3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Dec 10 16:10:11 2018 +0100 Merge remote-tracking branch 'gk/bug_25779_v4' projects/tor/build | 10 +++++++--- projects/tor/config | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor-browser-build/master] Bug 25779: Enable Rust in Tor for macOS nightlies
by boklm＠torproject.org 10 Dec '18

10 Dec '18

commit 54f63e3176ec840e37c283689746b2a0cb419f8c Author: Georg Koppen <gk(a)torproject.org> Date: Sun Dec 9 19:07:01 2018 +0000 Bug 25779: Enable Rust in Tor for macOS nightlies --- projects/tor/build | 10 +++++++--- projects/tor/config | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/projects/tor/build b/projects/tor/build index c8f63bc..e9bd326 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -11,6 +11,10 @@ mkdir -p /var/tmp/build [% END %] [% IF c("var/osx") %] + [% IF ("var/nightly") %] + # We are compiling Tor with Rust enabled for nightlies. + export TOR_RUST_TARGET=x86_64-apple-darwin + [% END %] TORBINDIR="$distdir/Contents/MacOS/Tor" TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor" mkdir -p $distdir/bin @@ -20,7 +24,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/dist -xf [% c('input_files_by_name/openssl') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/libevent') %] -[% IF c("var/linux") && c("var/nightly") %] +[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] export PATH=/var/tmp/dist/rust/bin:$PATH [% END %] @@ -70,11 +74,11 @@ cd /var/tmp/build/[% project %]-[% c('version') %] echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh find -type f -print0 | xargs -0 [% c("var/touch") %] -[% IF c("var/linux") && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ +[% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]TOR_RUST_DEPENDENCIES=`pwd`/src/ext/rust/crates[% END %] ./configure --disable-asciidoc --with-libevent-dir="$libeventdir" --with-openssl-dir="$openssldir" \ [% IF c("var/asan") %]--enable-fragile-hardening[% END %] \ [% IF c("var/windows") %]--with-zlib-dir="$zlibdir"[% END %] \ [% IF c("var/osx") %]--enable-static-openssl[% END %] \ - [% IF c("var/linux") && c("var/nightly") %]--enable-rust[% END %] \ + [% IF (c("var/linux") || c("var/osx")) && c("var/nightly") %]--enable-rust[% END %] \ --prefix="$distdir" [% c("var/configure_opt") %] [% IF c("var/osx") || c("var/windows") -%] export LD_PRELOAD=[% c("var/faketime_path") %] diff --git a/projects/tor/config b/projects/tor/config index 4ba18d9..fe3bec9 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -65,4 +65,4 @@ input_files: input_file_var: rust_version: 1.28.0 prev_version: 1.27.2 - enable: '[% c("var/linux") && c("var/nightly") %]' + enable: '[% (c("var/linux") || c("var/osx")) && c("var/nightly") %]'

1 0

[tor-browser-build/master] Fix typo in changelog
by gk＠torproject.org 10 Dec '18

10 Dec '18

commit e4a246efc1cd4a7f67de440989ab0c053f302fbc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 10 07:57:52 2018 +0000 Fix typo in changelog Thanks to a cypherpunk on our blog for spotting that one. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 54645e8..13ab9c9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -64,7 +64,7 @@ Tor Browser 8.5a5 -- December 3 2018 * Bug 28657: Remove broken FTE bridge from Tor Browser * Android * Bug 28051: Fix up Orbot for inclusion into Tor Browser - * Bug 26690+25765: Port padlock states for .onion serices to mobile + * Bug 26690+25765: Port padlock states for .onion services to mobile * Bug 28507: Delete private data in the browser startup * Bug 27111+25013: Configure Tor Browser for mobile to load about:tor * Bug 27256: Enable TouchEvents on Android

1 0

[tor-browser-build/master] Bug 28771: Port get_hg_hash to Path::Tiny and note JSON dependency in README.
by boklm＠torproject.org 07 Dec '18

07 Dec '18

commit 56ce89fe1a99c304b7292a7087ae8d0ad2412273 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Dec 7 03:40:56 2018 +0000 Bug 28771: Port get_hg_hash to Path::Tiny and note JSON dependency in README. --- README | 3 ++- projects/firefox-locale-bundle/get_hg_hash | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README b/README index 5fb32ba..e1e93c6 100644 --- a/README +++ b/README @@ -26,6 +26,7 @@ You also need a few perl modules installed: - Template - IO::Handle - IO::CaptureOutput +- JSON - File::Temp - Path::Tiny - File::Path @@ -40,7 +41,7 @@ If you are running Debian or Ubuntu, you can install them with: # apt-get install libyaml-libyaml-perl libtemplate-perl \ libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libpath-tiny-perl \ + libio-captureoutput-perl libjson-perl libpath-tiny-perl \ libstring-shellquote-perl libsort-versions-perl \ libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ libfile-copy-recursive-perl git libgtk2.0-dev curl runc \ diff --git a/projects/firefox-locale-bundle/get_hg_hash b/projects/firefox-locale-bundle/get_hg_hash index 9b2b5bd..18b174e 100755 --- a/projects/firefox-locale-bundle/get_hg_hash +++ b/projects/firefox-locale-bundle/get_hg_hash @@ -1,6 +1,6 @@ #!/usr/bin/perl -w use strict; -use File::Slurp; +use Path::Tiny; use JSON; sub exit_error { @@ -11,7 +11,7 @@ sub exit_error { exit_error("Wrong number of arguments", 1) unless @ARGV == 2; my ($file, $locale) = @ARGV; -my $json_text = read_file($file); +my $json_text = path($file)->slurp_raw; exit_error("Error reading $file", 2) unless defined $json_text; my $data = decode_json($json_text);

1 0

[tor-browser-build/master] Bug 28725: Upgrade go-webrtc to dcbfc825aa33471253a5da1834d499257e05d557.
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit 2e1d3917340c980026c15ed9cf10e894ec665551 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Dec 3 23:13:51 2018 +0000 Bug 28725: Upgrade go-webrtc to dcbfc825aa33471253a5da1834d499257e05d557. This necessitates an upgrade to webrtc to branch-heads/64. Compare to: https://github.com/keroserene/go-webrtc/commit/1ca4087bc01b9a6726a68c72ac54… -D_GLIBCXX_USE_CXX11_ABI=1 is no longer required, as the default has changed: https://github.com/keroserene/go-webrtc/commit/a3140c36f9933013ad2e66bc2135… I needed to add libgtk-3-dev as a build dependency for webrtc. libgtk-3-dev appears in src/build/install-build-deps.sh. I also had to upgrade depot_tools to 7d9d9233cb657e968831238346917b0b64abb4c1. I got the commit ID from src/DEPS in the webrtc source. Without upgrading depot_tools, I got this error from gclient: Error: 1> dependency url must be either a string, None, File() or From() instead of dict I needed to add a command to delete src/testing/{gmock,gtest}; otherwise "gclient sync" complains about overwriting unversioned files. https://bugs.torproject.org/25483#comment:15 https://gitweb.torproject.org/user/boklm/tor-browser-build.git/commit/?h=bu… The error is src/testing (ERROR) ---------------------------------------- [0:00:00] Started. [0:00:01] From https://chromium.googlesource.com/chromium/src/testing [0:00:01] 7d7436a8..9805faa0 master -> origin/master ---------------------------------------- Error: Command 'git checkout --quiet 60c665fffe7dc505fdd5d30f9dbcbc50dde1e017' returned non-zero exit status 1 in /home/user/tor-browser-build/gclient/webrtc/src/testing error: The following untracked working tree files would be overwritten by checkout: gmock/include/gmock/gmock-actions.h gmock/include/gmock/gmock-generated-function-mockers.h gmock/include/gmock/gmock-matchers.h gmock/include/gmock/gmock.h gtest/include/gtest/gtest-death-test.h gtest/include/gtest/gtest-message.h gtest/include/gtest/gtest-param-test.h gtest/include/gtest/gtest-spi.h gtest/include/gtest/gtest.h gtest/include/gtest/gtest_prod.h Please move or remove them before you switch branches. Aborting --- projects/depot_tools/config | 2 +- projects/go-webrtc/config | 8 +- projects/webrtc/build | 6 +- projects/webrtc/config | 6 +- projects/webrtc/webrtc-linux.patch | 12 +-- projects/webrtc/webrtc-mac.patch | 204 +++++++++++++++---------------------- 6 files changed, 99 insertions(+), 139 deletions(-) diff --git a/projects/depot_tools/config b/projects/depot_tools/config index 40a6d85..a1848dc 100644 --- a/projects/depot_tools/config +++ b/projects/depot_tools/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_hash: 28216cd14b44716db5c83634afbdc6e90492652b +git_hash: 7d9d9233cb657e968831238346917b0b64abb4c1 git_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git filename: '[% project %]-[% c("version") %].tar.gz' diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 65be36f..8b171f9 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/keroserene/go-webrtc.git -git_hash: 90ac15ae07cc6e820cd922a239dd892598986622 +git_hash: dcbfc825aa33471253a5da1834d499257e05d557 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -21,12 +21,8 @@ var: rm -rf include/ lib/ cp -a /var/tmp/dist/webrtc/{include,lib} . [% IF c("var/linux") -%] - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # the prebuilt libwebrtc-magic.a libraries. Since we build our own - # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, - # using CGO_CXXFLAGS. # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_CXXFLAGS="-D__STDC_FORMAT_MACROS=1" export CGO_LDFLAGS=-latomic [% END -%] [% IF c("var/osx") -%] diff --git a/projects/webrtc/build b/projects/webrtc/build index a1abd92..ecbccb3 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -101,6 +101,8 @@ GN_ARGS+=" treat_warnings_as_errors=false" GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. GN_ARGS+=" is_clang=false use_sysroot=false" +# Use libstdc++, not libc++. +GN_ARGS+=" use_custom_libcxx=false" [% IF c("var/linux") -%] GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" @@ -116,6 +118,8 @@ GN_ARGS+=" is_clang=false use_sysroot=false" GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" GN_ARGS+=" clang_use_chrome_plugins=false" GN_ARGS+=" clang_base_path=\"$clangdir\"" + # No lld in our toolchain currently. + GN_ARGS+=" use_lld=false" # Avoid some dependencies. GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" # Tests are needed for field_trial, metrics_default, and pc_test_utils targets @@ -147,7 +151,7 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -find webrtc/ -type f -name '*.h' -print0 | while IFS= read -r -d '' h; +find . -type f -name '*.h' -print0 | while IFS= read -r -d '' h; do mkdir -p "$INCLUDE_DIR/$(dirname "$h")" cp -f "$h" "$INCLUDE_DIR/$h" diff --git a/projects/webrtc/config b/projects/webrtc/config index da60d2d..2955095 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -5,7 +5,7 @@ filename: 'webrtc-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") var: container: use_container: 1 - webrtc_tag: c279861207c5b15fc51069e96595782350e0ac12 + webrtc_tag: 88f5d9180eae78a6162cccd78850ff416eb82483 input_files: - project: container-image @@ -33,6 +33,7 @@ targets: - libexpat1-dev - libglib2.0-dev - libgtk2.0-dev + - libgtk-3-dev - libudev-dev - libx11-dev - libxext-dev @@ -101,6 +102,9 @@ steps: git config diff.ignoreSubmodules all cd .. fi + # Delete the unversioned gmock and gtest directories, which cause "gclient sync" + # to fail when upgrading between webrtc branch-heads/58 and branch-heads/64. + rm -rf src/testing/gmock src/testing/gtest # "gclient" is part of depot_tools. This download takes a long time the first time. gclient sync --no-history --with_branch_heads -r [% c("var/webrtc_tag") %] cd .. diff --git a/projects/webrtc/webrtc-linux.patch b/projects/webrtc/webrtc-linux.patch index b1efb7a..efeebbb 100644 --- a/projects/webrtc/webrtc-linux.patch +++ b/projects/webrtc/webrtc-linux.patch @@ -1,6 +1,6 @@ -From ebc1773a92884bec7d93274b2d729ccf76050197 Mon Sep 17 00:00:00 2001 -From: David Fifield <fifield(a)eecs.berkeley.edu> -Date: Wed, 22 Mar 2017 09:53:07 -0400 +From 2d7897d479a13cbf68335140b61228cd5552dfd9 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 3 Dec 2018 21:14:32 -0700 Subject: [PATCH] Disable some settings in build_overrides. --- @@ -8,10 +8,10 @@ Subject: [PATCH] Disable some settings in build_overrides. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_overrides/build.gni b/build_overrides/build.gni -index af4924d4c..ffaafdebc 100644 +index 81cb3e73ae..5304a64ce8 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni -@@ -14,7 +14,7 @@ mac_sdk_min_build_override = "10.11" +@@ -10,7 +10,7 @@ enable_java_templates = true # Some non-Chromium builds don't use Chromium's third_party/binutils. @@ -21,5 +21,5 @@ index af4924d4c..ffaafdebc 100644 # Variable that can be used to support multiple build scenarios, like having # Chromium specific targets in a client project's GN file etc. -- -2.12.1 +2.11.0 diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch index 6b888bb..d1144af 100644 --- a/projects/webrtc/webrtc-mac.patch +++ b/projects/webrtc/webrtc-mac.patch @@ -1,7 +1,7 @@ -From bd27c327f72ea231353983aa35a0c3e6ae8055d5 Mon Sep 17 00:00:00 2001 +From df1a0923f1534a238e9773000dd03dd7b55e2c72 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:26:55 -0700 -Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. +Date: Mon, 3 Dec 2018 21:03:16 -0700 +Subject: [PATCH 1/6] Disable assertions that prevent cross-compiling for mac. --- config/BUILDCONFIG.gn | 4 ++-- @@ -9,10 +9,10 @@ Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index d055e705..78a2023a 100644 +index 48ed140c7..15e06808c 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn -@@ -232,8 +232,8 @@ if (target_os == "android") { +@@ -238,8 +238,8 @@ if (target_os == "android") { } else if (target_os == "ios") { _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" } else if (target_os == "mac") { @@ -22,9 +22,9 @@ index d055e705..78a2023a 100644 + _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" } else if (target_os == "win") { # On Windows we use the same toolchain for host and target by default. - assert(target_os == host_os, "Win cross-compiles only work on win hosts.") + # Beware, win cross builds mostly don't work yet, see docs/win_cross.md diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn -index b417e76a..5f48927d 100644 +index fc113d6a3..7a0171700 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -14,7 +14,7 @@ if (is_ios) { @@ -36,13 +36,13 @@ index b417e76a..5f48927d 100644 import("//build/toolchain/cc_wrapper.gni") import("//build/toolchain/clang_static_analyzer.gni") --- +-- 2.11.0 -From a58bb43ea406939fcc978aa808714d04802074ac Mon Sep 17 00:00:00 2001 +From c9cdc59ebb986392367115105ecbc1f5b511130d Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:29:14 -0700 -Subject: [PATCH 2/8] Hardcode cross-compiling flags in config/mac/BUILD.gn. +Date: Mon, 3 Dec 2018 21:04:26 -0700 +Subject: [PATCH 2/6] Hardcode cross-compiling flags in config/mac/BUILD.gn. The build system doesn't provide a general way to set flags externally. "No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" @@ -52,12 +52,12 @@ https://bugs.chromium.org/p/chromium/issues/detail?id=595653 1 file changed, 5 insertions(+) diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn -index 84180e6a..2054b46f 100644 +index 4c681e88c..26fbcac2b 100644 --- a/build/config/mac/BUILD.gn +++ b/build/config/mac/BUILD.gn -@@ -83,6 +83,11 @@ config("runtime_library") { +@@ -57,6 +57,11 @@ config("runtime_library") { "-isysroot", - sysroot, + rebase_path(sysroot, root_build_dir), "-mmacosx-version-min=$mac_deployment_target", + "-target", + "x86_64-apple-darwin11", @@ -67,13 +67,47 @@ index 84180e6a..2054b46f 100644 ] asmflags = common_flags --- +-- +2.11.0 + +From 86d0882084c8b0595d693cce43e96b01182814b7 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Tue, 4 Dec 2018 07:37:42 +0000 +Subject: [PATCH 3/6] Remove -instcombine-lower-dbg-declare=0 from cflags. + +Not supported in our current version of llvm: +clang (LLVM option parsing): Unknown command line argument '-instcombine-lower-dbg-declare=0'. Try: 'clang (LLVM option parsing) -help' +clang (LLVM option parsing): Did you mean '-combiner-use-tbaa=0'? +--- + config/compiler/BUILD.gn | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn +index a6ba4ea6..e775f9f5 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -427,10 +427,10 @@ config("compiler") { + if (is_clang && !is_nacl && current_toolchain == host_toolchain && + target_os != "chromeos") { + cflags += [ +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-instcombine-lower-dbg-declare=0", ++ # "-Xclang", ++ # "-mllvm", ++ # "-Xclang", ++ # "-instcombine-lower-dbg-declare=0", + ] + } + +-- 2.11.0 -From 4c57d854280a0f0a4f55cba0457ae44f6369ca08 Mon Sep 17 00:00:00 2001 +From 96d243466006263e99b08ebf8b6085c60b736ccc Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:30:28 -0700 -Subject: [PATCH 3/8] Port build/config/mac/plist_util.py to biplist. +Date: Mon, 3 Dec 2018 21:06:06 -0700 +Subject: [PATCH 4/6] Port build/config/mac/plist_util.py to biplist. So as not to require the plutil command. plutil was only being used to convert between XML and binary plist formats, because versions of the @@ -105,7 +139,7 @@ OSError: [Errno 2] No such file or directory 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py -index 0928fa13..898edc1a 100644 +index bba0208a5..019dcf918 100644 --- a/build/config/mac/plist_util.py +++ b/build/config/mac/plist_util.py @@ -3,7 +3,7 @@ @@ -117,7 +151,7 @@ index 0928fa13..898edc1a 100644 import os import re import subprocess -@@ -116,6 +116,7 @@ def Interpolate(plist, substitutions): +@@ -89,6 +89,7 @@ def Interpolate(value, substitutions): def LoadPList(path): """Loads Plist at |path| and returns it as a dictionary.""" @@ -125,133 +159,55 @@ index 0928fa13..898edc1a 100644 fd, name = tempfile.mkstemp() try: subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) -@@ -127,6 +128,7 @@ def LoadPList(path): +@@ -100,6 +101,7 @@ def LoadPList(path): def SavePList(path, format, data): """Saves |data| as a Plist to |path| in the specified |format|.""" + return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format fd, name = tempfile.mkstemp() try: - with os.fdopen(fd, 'w') as f: --- -2.11.0 - -From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:41:16 -0700 -Subject: [PATCH 5/8] Include <sys/socket.h> in macifaddrs_converter.cc. - -Without this, when built against MacOSX10.7.sdk, there are errors: - -In file included from ../../webrtc/base/macifaddrs_converter.cc:13: -/home/debian/build/MacOSX10.7.sdk/usr/include/net/if.h:300:19: error: field has incomplete type 'struct sockaddr' - struct sockaddr ifru_addr; - -Related references: -https://trac.macports.org/ticket/49012 -https://trac.macports.org/browser/trunk/dports/gnome/gstreamer1/files/patch-struct-sockadr.diff?rev=140712 ---- - webrtc/base/macifaddrs_converter.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/webrtc/base/macifaddrs_converter.cc b/webrtc/base/macifaddrs_converter.cc -index 2ad070e8e..1995f1940 100644 ---- a/webrtc/base/macifaddrs_converter.cc -+++ b/webrtc/base/macifaddrs_converter.cc -@@ -10,6 +10,7 @@ - - #include <memory> - -+#include <sys/socket.h> - #include <net/if.h> - #include <sys/ioctl.h> - #include <unistd.h> + # "plutil" does not replace the destination file but update it in place, -- 2.11.0 - -From e6a421534723408fb1292ce25051a1970f750a4a Mon Sep 17 00:00:00 2001 -From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:42:34 -0700 -Subject: [PATCH 6/8] Provide definitions of NS_ENUM and NS_OPTIONS. - ---- - webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -index f9f15c37d..277676d85 100644 ---- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h -@@ -25,4 +25,17 @@ - #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname - #endif - -+// http://iamthewalr.us/blog/2012/11/ns_enum-and-ns_options/ -+#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum)) -+#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type -+#if (__cplusplus) -+#define NS_OPTIONS(_type, _name) _type _name; enum : _type -+#else -+#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type -+#endif -+#else -+#define NS_ENUM(_type, _name) _type _name; enum -+#define NS_OPTIONS(_type, _name) _type _name; enum -+#endif -+ - #endif // WEBRTC_BASE_OBJC_RTC_MACROS_H_ --- -2.11.0 - - -From baf5ddbd1e1281cd7c4cdda709e2ea7e07903727 Mon Sep 17 00:00:00 2001 +From eb3787dd670900cc2c3020c9323a9d95983c8887 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:43:05 -0700 -Subject: [PATCH 7/8] Replace firstObject with objectAtIndex:0. - -firstObject doesn't exist in our version of the SDK. +Date: Tue, 4 Dec 2018 05:16:04 +0000 +Subject: [PATCH 5/6] Override use_system_xcode=true. -The two method calls are not exactly the same; on an empty array, -firstObject returns nil while objectAtIndex:0 raises an exception. Let's -hope that doesn't matter. --- - webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -index 182056228..93bea08f9 100644 ---- a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -+++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm -@@ -176,7 +176,7 @@ using namespace webrtc::videocapturemodule; + build_overrides/build.gni | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index 81cb3e73ae..b683ea850c 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -46,3 +46,5 @@ if (host_os == "mac") { + "hermetic toolchain if the minimum OS version is not met.") + use_system_xcode = _result == 0 } - - - (AVCaptureVideoDataOutput*)currentOutput { -- return [[_captureSession outputs] firstObject]; -+ return [[_captureSession outputs] objectAtIndex:0]; - } - - - (void)startCaptureInBackgroundWithOutput: ++ ++use_system_xcode = true -- 2.11.0 - -From 0b5f86af5bc4b7697ee60adf7e1e057a023438e0 Mon Sep 17 00:00:00 2001 +From 5df71ea8f31fd25a05c6b6b881c8126b25b5475c Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> -Date: Mon, 26 Jun 2017 11:43:51 -0700 -Subject: [PATCH 8/8] Disable the desktop_capture module. +Date: Mon, 3 Dec 2018 21:11:14 -0700 +Subject: [PATCH 6/6] Disable the desktop_capture module. It's causing an error related to CoreGraphics.h and hopefully we don't need it. --- - webrtc/modules/BUILD.gn | 1 - + modules/BUILD.gn | 1 - 1 file changed, 1 deletion(-) -diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn -index e750a8109..590f34275 100644 ---- a/webrtc/modules/BUILD.gn -+++ b/webrtc/modules/BUILD.gn -@@ -18,7 +18,6 @@ group("modules") { +diff --git a/modules/BUILD.gn b/modules/BUILD.gn +index 465f32d3c4..578cdbd57e 100644 +--- a/modules/BUILD.gn ++++ b/modules/BUILD.gn +@@ -17,7 +17,6 @@ group("modules") { "audio_processing", "bitrate_controller", "congestion_controller",

1 0

[tor-browser-build/master] Use whitespace-safe loops over filenames in the webrtc build.
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit d8db312e4527c694e8f906a5e8926d0dc0c37179 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 6 07:55:25 2018 +0000 Use whitespace-safe loops over filenames in the webrtc build. --- projects/webrtc/build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 5a6cece..a1abd92 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -138,7 +138,8 @@ ninja -C out/Release webrtc field_trial metrics_default pc_test_utils # like that, not necessarily of the target architecture, and anyway are not # needed. # https://bugs.torproject.org/22832 -[% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %]"$AR" crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) +find out/Release/obj -name '*.o' -print0 | sort -z \ + | [% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %] xargs -0 -- "$AR" crs libwebrtc-magic.a mkdir -p $distdir cd $distdir @@ -146,9 +147,9 @@ mkdir -p include lib cp -f $builddir/libwebrtc-magic.a [% c("var/webrtc/lib_path") %] INCLUDE_DIR="$PWD/include" cd $builddir -for h in $(find webrtc/ -type f -name '*.h'); +find webrtc/ -type f -name '*.h' -print0 | while IFS= read -r -d '' h; do - mkdir -p "$INCLUDE_DIR/$(dirname $h)" + mkdir -p "$INCLUDE_DIR/$(dirname "$h")" cp -f "$h" "$INCLUDE_DIR/$h" done

1 0

[tor-browser-build/master] Bug 28775: Add mercurial in tbb-build ansible role
by gk＠torproject.org 07 Dec '18

07 Dec '18

commit ea1fc73e70e73d6b930c99fdfe5a729579613002 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 7 11:41:25 2018 +0100 Bug 28775: Add mercurial in tbb-build ansible role With #26843 we now require mercurial to be installed, so it should be installed by the tbb-build ansible role. --- tools/ansible/roles/tbb-builder/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/ansible/roles/tbb-builder/tasks/main.yml b/tools/ansible/roles/tbb-builder/tasks/main.yml index f27c6cf..4e84709 100644 --- a/tools/ansible/roles/tbb-builder/tasks/main.yml +++ b/tools/ansible/roles/tbb-builder/tasks/main.yml @@ -22,6 +22,7 @@ - libgtk2.0-dev - curl - runc + - mercurial - name: Install dependencies for update_responses script apt:

1 0

[tor-browser-build/master] Release preparations for 8.5a6
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 76243271b0f02b0a965a0294ef8242c787bfc668 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 22:31:40 2018 +0000 Release preparations for 8.5a6 Changelog update and versions bump --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++ projects/torbutton/config | 2 +- rbm.conf | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 4e42939..04cd7dd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 7ffaf43..639d504 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.3.0 + firefox_platform_version: 60.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5c3732b..54645e8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 8.5a6 -- December 11 2018 + * All Platforms + * Update Firefox to 60.4.0esr + * Update OpenSSL to 1.0.2q + * Update Torbutton to 2.1.3 + * Bug 28540: Use new text for 2018 donation banner + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 28075: Tone down missing SOCKS credential warning + * Bug 28747: Remove NoScript (XPCOM) related unused code + * Translations update + * Bug 28608: Disable background HTTP response throttling + * Bug 28695: Set default security.pki.name_matching_mode to enforce (3) + * Bug 27290: Remove WebGL pref for min capability mode + * Bug 27919: Backport SSL status API + * Windows + * Bug 28740: Adapt Windows navigator.platform value on 64-bit systems + * Android + * Bug 26843: Multi-locale support for Tor Browser on Android + * Build System + * Android + * Bug 25164: Add .apk to our sha256sums unsigned build file + * Bug 28696: Make path to Gradle dependencies reproducible + * Bug 28697: Use pregenerated keystore and fix timestamp issues + Tor Browser 8.5a5 -- December 3 2018 * All Platforms * Update Torbutton to 2.1.2 diff --git a/projects/torbutton/config b/projects/torbutton/config index 2e48f31..0fff877 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.2 +version: 2.1.3 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 f64a80b..a397752 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a5' - torbrowser_build: 'build2' + torbrowser_version: '8.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5a4 + - 8.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Bug 28697: No need to specify the architecture for using Buster
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit 0a2cc62f08063cc0c91b1db57e87505c954349a9 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 6 22:06:03 2018 +0000 Bug 28697: No need to specify the architecture for using Buster --- projects/tor-browser/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3a7f035..6199954 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -51,7 +51,6 @@ targets: # leads to a stalled build. Work around this by switching to Buster. container: suite: buster - arch: amd64 input_files: - project: container-image

1 0

[tor-browser/tor-browser-60.3.0esr-8.5-1] Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv
by gk＠torproject.org 06 Dec '18

06 Dec '18

commit a3cbc068df86e03a6420bc863be2793e35078fa3 Author: Chris Peterson <cpeterson(a)mozilla.com> Date: Mon Jul 2 11:02:23 2018 -0700 Bug 1472618 - Make navigator.platform return "Win32", even on Win64 OS. r=peterv navigator.platform returns "Win64" in 64-bit Firefox and IE, but "Win32" in 64-bit Chrome and Edge. "Win32" appears to be the de facto platform value for Windows. This change doesn't hide the OS architecture from web content because navigator.userAgent still mentions "Win64; x64" in 64-bit Firefox, Chrome, Edge, and IE. MozReview-Commit-ID: CplYnGDQgTe --HG-- extra : rebase_source : c00a1a7462ea91d44700dd0581c88c1c4cad2346 extra : source : 1976c327f251702be255a9d0769121c6bc5303a1 This fixes our bug 28740. --- .../components/resistfingerprinting/test/browser/browser_navigator.js | 2 +- dom/base/Navigator.cpp | 4 +--- toolkit/components/resistfingerprinting/nsRFPService.h | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js index e0aaf6fb27fe..3736fcd33ce5 100644 --- a/browser/components/resistfingerprinting/test/browser/browser_navigator.js +++ b/browser/components/resistfingerprinting/test/browser/browser_navigator.js @@ -24,7 +24,7 @@ const SPOOFED_APPVERSION = { }; const SPOOFED_PLATFORM = { linux: "Linux x86_64", - win: "Win64", + win: "Win32", macosx: "MacIntel", android: "Linux armv7l", other: "Linux x86_64", diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 33563ad65ccb..55d1f7a0474b 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1653,9 +1653,7 @@ Navigator::GetPlatform(nsAString& aPlatform, bool aUsePrefOverriddenValue) // Sorry for the #if platform ugliness, but Communicator is likewise // hardcoded and we are seeking backward compatibility here (bug 47080). -#if defined(_WIN64) - aPlatform.AssignLiteral("Win64"); -#elif defined(WIN32) +#if defined(WIN32) aPlatform.AssignLiteral("Win32"); #elif defined(XP_MACOSX) && defined(__ppc__) aPlatform.AssignLiteral("MacPPC"); diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index da79da8de948..4ed0c1d4cfaf 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -25,7 +25,7 @@ #define SPOOFED_UA_OS "Windows NT 6.1; Win64; x64" #define SPOOFED_APPVERSION "5.0 (Windows)" #define SPOOFED_OSCPU "Windows NT 6.1; Win64; x64" -#define SPOOFED_PLATFORM "Win64" +#define SPOOFED_PLATFORM "Win32" #elif defined(XP_MACOSX) #define SPOOFED_UA_OS "Macintosh; Intel Mac OS X 10.13" #define SPOOFED_APPVERSION "5.0 (Macintosh)"

1 0