- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-85.0-10.5-1] Bug 40309: Avoid using regional OS locales
by sysrqb＠torproject.org 04 Feb '21

04 Feb '21

commit 705bed3f64e11969c3dc58507c476456f9cd2a28 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Jan 27 11:28:05 2021 +0100 Bug 40309: Avoid using regional OS locales Only use regional OS locales if the pref `intl.regional_prefs.use_os_locales` is set to true. --- intl/locale/LocaleService.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp index 6e59119f623b..add1ac1730eb 100644 --- a/intl/locale/LocaleService.cpp +++ b/intl/locale/LocaleService.cpp @@ -457,31 +457,6 @@ LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { OSPreferences::GetInstance()->GetRegionalPrefsLocales(aRetVal))) { return NS_OK; } - - // If we fail to retrieve them, return the app locales. - GetAppLocalesAsBCP47(aRetVal); - return NS_OK; - } - - // Otherwise, fetch OS Regional Preferences locales and compare the first one - // to the app locale. If the language subtag matches, we can safely use - // the OS Regional Preferences locale. - // - // This facilitates scenarios such as Firefox in "en-US" and User sets - // regional prefs to "en-GB". - nsAutoCString appLocale; - AutoTArray<nsCString, 10> regionalPrefsLocales; - LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocale); - - if (NS_FAILED(OSPreferences::GetInstance()->GetRegionalPrefsLocales( - regionalPrefsLocales))) { - GetAppLocalesAsBCP47(aRetVal); - return NS_OK; - } - - if (LocaleService::LanguagesMatch(appLocale, regionalPrefsLocales[0])) { - aRetVal = regionalPrefsLocales.Clone(); - return NS_OK; } // Otherwise use the app locales.

1 0

[Git][tpo/applications/android-components][android-components-72.0.5-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel 04 Feb '21

04 Feb '21

Matthew Finkel pushed to branch android-components-72.0.5-10.5-1 at The Tor Project / Applications / android-components Commits: e2eec881 by Matthew Finkel at 2021-02-04T17:11:59+00:00 Bug 40005: Modify Default toolbar menu - - - - - f9e90742 by Alex Catarineu at 2021-02-04T17:11:59+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 92f82ce0 by Alex Catarineu at 2021-02-04T17:11:59+00:00 Bug 40002: Ensure system download manager is not used - - - - - b42e4504 by Alex Catarineu at 2021-02-04T17:11:59+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - 084b5ed6 by Alex Catarineu at 2021-02-04T17:11:59+00:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - 38f86460 by Georg Koppen at 2021-02-04T17:11:59+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - cdf2ab02 by Alex Catarineu at 2021-02-04T17:11:59+00:00 Bug 40015: Port padlock states for .onion services - - - - - 627f9fea by Alex Catarineu at 2021-02-04T17:11:59+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 4dcc76bc by Alex Catarineu at 2021-02-04T17:11:59+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - 7ed961dc by Matthew Finkel at 2021-02-04T17:11:59+00:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - 56fabb7d by Matthew Finkel at 2021-02-04T17:11:59+00:00 Bug 40023: Stop PrivateNotificationService - - - - - 9e58e00f by Matthew Finkel at 2021-02-04T17:14:03+00:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-72.0.5-10.5-1
by Matthew Finkel 04 Feb '21

04 Feb '21

Matthew Finkel pushed new branch android-components-72.0.5-10.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-86.0.0b2-10.5-1] squash! Modify build system
by Matthew Finkel 04 Feb '21

04 Feb '21

Matthew Finkel pushed to branch tor-browser-86.0.0b2-10.5-1 at The Tor Project / Applications / fenix Commits: b531202a by Matthew Finkel at 2021-02-04T16:52:44+00:00 squash! Modify build system Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apk's versionName. - - - - - 1 changed file: - buildSrc/src/main/java/Config.kt Changes: ===================================== buildSrc/src/main/java/Config.kt ===================================== @@ -19,7 +19,12 @@ object Config { @JvmStatic private fun generateDebugVersionName(): String { - val today = Date() + val today = if (System.getenv("MOZ_BUILD_DATE") != null) { + val format = SimpleDateFormat("yyyyMMddHHmmss", Locale.US) + format.parse(System.getenv("MOZ_BUILD_DATE")) + } else { + Date() + } // Append the year (2 digits) and week in year (2 digits). This will make it easier to distinguish versions and // identify ancient versions when debugging issues. However this will still keep the same version number during // the week so that we do not end up with a lot of versions in tools like Sentry. As an extra this matches the View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/b531202a21ad0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/b531202a21ad0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-86.0.0b2-10.5-1] 8 commits: Bug 40002: Add GitLab CI
by Matthew Finkel 04 Feb '21

04 Feb '21

Matthew Finkel pushed to branch tor-browser-86.0.0b2-10.5-1 at The Tor Project / Applications / fenix Commits: ded9d6e3 by Matthew Finkel at 2021-02-03T04:31:42+00:00 Bug 40002: Add GitLab CI Pin CI builds to runners with 32GB of RAM to avoid OOM conditions. - - - - - 812cb012 by Matthew Finkel at 2021-02-03T04:31:42+00:00 Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen - - - - - 331d3a3f by Matthew Finkel at 2021-02-03T04:32:26+00:00 Disable features and functionality Bug 33594: Disable data collection by default (Glean) Bug 40019: Adjust is disabled on Release when data collection is disabled Bug 34338: Disable the crash reporter Bug 40014: Neuter Google Advertising ID Bug 40018: Disable Push service Bug 40034: Disable PWA onboading Bug 40072: Disable Tracking Protection Bug 40061: Do not show "Send to device" in sharing menu Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - 6e156ac4 by Georg Koppen at 2021-02-03T04:32:34+00:00 Modify build system Bug 40083: Make locale ordering in BuildConfig deterministic Bug 40042: Add option do overwrite timestamp in extension version Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. Bug 40071: Show only supported locales Bug 40064: Use Gecko Beta for Nightly and Debug variants Bug 40123: Allow building the instrumented tests apks for variants other than debug This allows to specify the variant of the instrumented tests via a `testBuildType` gradle argument. It also applies a workaround for a R8 issue from https://issuetracker.google.com/issues/140851070. - - - - - 6ee8ee7c by Matthew Finkel at 2021-02-03T04:32:34+00:00 Add Tor integration and UI Bug 40001: Start Tor as part of the Fenix initialization Bug 40028: Implement Tor Service controller Bug 40028: Integrate Tor Controller into HomeFragment Bug 40028: Implement Tor connect and logger screens Bug 40028: Implement Tor Onboarding Bug 40028: Implement new home screen Bug 40028: Define bootstrapping events and Quick Start Bug 40041: Implement Tor Network Settings Bug 40041: Integrate Tor Network Settings - - - - - 94fd1e73 by Alex Catarineu at 2021-02-03T04:32:34+00:00 Modify UI/UX Bug 40015: Modify Home menu Bug 40016: Hide unwanted Settings Bug 40016: Modify Default toolbar menu Bug 40016: Add Donate settings button Bug 40016: Move Allow Screenshots under Advanced Bug 40016: Don't install WebCompat webext Bug 40016: Don't onboard Search Suggestions Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment Bug 40095: Hide "Sign in to sync" in bookmarks Bug 40031: Hide Mozilla-specific items on About page Bug 40032: Set usesCleartextTraffic as false Bug 40063: Do not sort search engines alphabetically Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Bug 34403: Disable Normal mode by default Bug 40087: Implement a switch for english locale spoofing Bug 40141: Hide EME site permission - - - - - cdb30b68 by Alex Catarineu at 2021-02-03T04:32:39+00:00 Modify Add-on support Bug 40030: Install HTTPS Everywhere and NoScript addons on startup HTTPS Everywhere is installed as a builtin extension and NoScript as a regular AMO addon. To avoid unnecessary I/O we only install NoScript the first time, and rely on the browser addon updating mechanism for keeping up with new versions. This is the same behaviour that was implemented in the Fennec-based Tor Browser, where it was installed as a "distribution addon", which also only occurred once. Bug 40062: HTTPS Everywhere is not shown as installed Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. In this list, we replace https-everywhere by our https-everywhere-eff, so that the EFF one is shown as installed in the addons list and the AMO one is not displayed. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - 11afc5e6 by Matthew Finkel at 2021-02-03T04:32:58+00:00 Add Security Level UI Bug 40026: Implement Security Level settings Bug 40026: Integrate Security Level settings - - - - - 30 changed files: - + .gitlab-ci.yml - app/build.gradle - app/proguard-rules.pro - app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt - − app/src/beta/res/drawable/ic_launcher_foreground.xml - app/src/beta/res/mipmap-hdpi/ic_launcher.png - app/src/beta/res/mipmap-mdpi/ic_launcher.png - app/src/beta/res/mipmap-xhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxhdpi/ic_launcher.png - app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png - app/src/beta/res/values/static_strings.xml - app/src/beta/res/xml/shortcuts.xml - − app/src/debug/res/drawable/ic_launcher_foreground.xml - app/src/debug/res/xml/shortcuts.xml - app/src/main/AndroidManifest.xml - + app/src/main/assets/allowed_addons.json - app/src/main/java/org/mozilla/fenix/FeatureFlags.kt - app/src/main/java/org/mozilla/fenix/FenixApplication.kt - app/src/main/java/org/mozilla/fenix/HomeActivity.kt - app/src/main/java/org/mozilla/fenix/addons/InstalledAddonDetailsFragment.kt - app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt - app/src/main/java/org/mozilla/fenix/components/Analytics.kt - app/src/main/java/org/mozilla/fenix/components/Components.kt - app/src/main/java/org/mozilla/fenix/components/Core.kt - + app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt - + app/src/main/java/org/mozilla/fenix/components/TorBrowserFeatures.kt - app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt - app/src/main/java/org/mozilla/fenix/components/metrics/MetricsUtils.kt - app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/159c13ba04cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/159c13ba04cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/master] Bug 40212: Bump version of snowflake and webrtc
by gk＠torproject.org 04 Feb '21

04 Feb '21

commit 7e305c498862145ec7db3cad843beea4c4fa0879 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 22 11:51:33 2021 -0500 Bug 40212: Bump version of snowflake and webrtc Bumps snowflake to 1b29ad7de1 and pion-webrtc to v3.0.0 --- projects/goxxerrors/config | 2 +- projects/goyaml/config | 4 ++-- projects/pion-datachannel/config | 2 +- projects/pion-dtls/config | 5 ++++- projects/pion-ice/config | 8 +++++++- projects/pion-interceptor/config | 30 ++++++++++++++++++++++++++++++ projects/pion-randutil/config | 17 +++++++++++++++++ projects/pion-rtcp/config | 2 +- projects/pion-rtp/config | 8 ++++---- projects/pion-sctp/config | 5 ++++- projects/pion-sdp/config | 5 ++++- projects/pion-srtp/config | 5 +---- projects/pion-transport/config | 6 ++++-- projects/pion-turn/config | 5 ++++- projects/pion-udp/config | 21 +++++++++++++++++++++ projects/pion-webrtc/config | 13 +++++++++++-- projects/snowflake/config | 2 +- projects/testify/config | 2 +- projects/uuid/config | 17 +++++++++++++++++ 19 files changed, 135 insertions(+), 24 deletions(-) diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config index 6733498..5c1b379 100644 --- a/projects/goxxerrors/config +++ b/projects/goxxerrors/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/xerrors -git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 +git_hash: 5ec99f83aff198f5fbd629d6c8d8eb38a04218ca filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goyaml/config b/projects/goyaml/config index fd81e4c..f631045 100644 --- a/projects/goyaml/config +++ b/projects/goyaml/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://gopkg.in/yaml.v2 -git_hash: 51d6538a90f86fe93ac480b35f37b2be17fef232 # v2.2.2 +git_hash: 0b1645d91e851e735d3e23330303ce81f70adbe3 #v2.3.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -9,7 +9,7 @@ build: '[% c("projects/go/var/build_go_lib") %]' var: container: use_container: 1 - go_lib: gopkg.in/yaml.v2 + go_lib: gopkg.in/yaml.v3 go_lib_deps: - gocheck diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index c36a0bb..e90291d 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: a245abfdaab4a9406cc2e18ad303b5d0717d43af # v1.4.16 +git_hash: 254d999070fc419be76d05e67e133fbdbc7daaf6 #v1.4.21 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 0ee19b4..b1d125a 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls -git_hash: 147774b64b6a8ac9bd0af5a7efff69ee8e0fd4a8 # v2.0.0-rc.7 +git_hash: 88c36d669c7c3935ac5dda6820bae22316341a98 #v2.0.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -16,6 +16,7 @@ var: - goxxerrors - pion-logging - pion-transport + - pion-udp input_files: - project: container-image @@ -31,3 +32,5 @@ input_files: project: pion-logging - name: pion-transport project: pion-transport + - name: pion-udp + project: pion-udp diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 042c014..4073134 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 5b6a2756ccaa173bd14050acf3d6e5d5d371bae8 # v0.7.10 +git_hash: 55ce2f2b052e0e49812912f058075a6292c83dbd #v2.0.15 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -15,10 +15,12 @@ var: - pion-dtls - pion-logging - pion-mdns + - pion-randutil - pion-stun - pion-transport - pion-turn - testify + - uuid input_files: - project: container-image @@ -32,6 +34,8 @@ input_files: project: pion-logging - name: pion-mdns project: pion-mdns + - name: pion-randutil + project: pion-randutil - name: pion-stun project: pion-stun - name: pion-transport @@ -40,3 +44,5 @@ input_files: project: pion-turn - name: testify project: testify + - name: uuid + project: uuid diff --git a/projects/pion-interceptor/config b/projects/pion-interceptor/config new file mode 100644 index 0000000..b2d1cdd --- /dev/null +++ b/projects/pion-interceptor/config @@ -0,0 +1,30 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/interceptor +git_hash: edb026a5dc1a8002a2159eca4ed1a2838c2f70b0 #v0.0.9 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/interceptor + go_lib_deps: + - pion-logging + - pion-rtcp + - pion-rtp + - testify + +input_files: + - project: container-image + - name: go + project: go + - name: pion-logging + project: pion-logging + - name: pion-rtcp + project: pion-rtcp + - name: pion-rtp + project: pion-rtp + - name: testify + project: testify diff --git a/projects/pion-randutil/config b/projects/pion-randutil/config new file mode 100644 index 0000000..28c74f0 --- /dev/null +++ b/projects/pion-randutil/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/randutil +git_hash: 3e7aefb6fd280d89fca72f1596348f1939525187 #v0.1.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/randutil + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-rtcp/config b/projects/pion-rtcp/config index dd76451..117420a 100644 --- a/projects/pion-rtcp/config +++ b/projects/pion-rtcp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtcp -git_hash: 02c67df9b6f60eafcbb9dfe0e46dbdc4a20fa74f # v1.2.1 +git_hash: 2185735bf8f510b85cb8a816cfa03a51478edfe5 #v1.2.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index b926612..2471de8 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: f7a712d0fb41baeacb3e2ef9ed68ed1aa42afb82 # v1.3.2 +git_hash: 0aac647df123bca012506293a9feb6b16938327d #v1.6.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,11 +11,11 @@ var: use_container: 1 go_lib: github.com/pion/rtp go_lib_deps: - - testify + - pion-randutil input_files: - project: container-image - name: go project: go - - name: testify - project: testify + - name: pion-randutil + project: pion-randutil diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index 89da952..946296c 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: 9e890a28db4990b61ba414e35f79108c19e0a7db # v1.7.6 +git_hash: 685587c17c56677c395bac0fa6329244826938fc #v1.7.11 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -15,6 +15,7 @@ var: - gocheck - goerrors - pion-logging + - pion-randutil - pion-transport - pretty - testify @@ -31,6 +32,8 @@ input_files: project: goerrors - name: pion-logging project: pion-logging + - name: pion-randutil + project: pion-randutil - name: pion-transport project: pion-transport - name: pretty diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index ed2dbdc..6029587 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 06fd9e503a8f545f663a757afb09b1e1833c7b2d # v2.3.4 +git_hash: 547e65c63c75339179e5ba8b8d9c06adcea74c31 #v3.0.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,11 +11,14 @@ var: use_container: 1 go_lib: github.com/pion/sdp go_lib_deps: + - pion-randutil - testify input_files: - project: container-image - name: go project: go + - name: pion-randutil + project: pion-randutil - name: testify project: testify diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index 310cf75..e980b95 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp -git_hash: 57349fe0710b65080a26d8855aa18689364560c3 # v1.2.7 +git_hash: 1c72ec6b73db20dcdf3e0828e20bb01d72d988c4 #v2.0.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,6 @@ var: use_container: 1 go_lib: github.com/pion/srtp go_lib_deps: - - go-spew - pion-logging - pion-rtcp - pion-rtp @@ -22,8 +21,6 @@ input_files: - project: container-image - name: go project: go - - name: go-spew - project: go-spew - name: pion-logging project: pion-logging - name: pion-rtcp diff --git a/projects/pion-transport/config b/projects/pion-transport/config index b2615be..6e15e6b 100644 --- a/projects/pion-transport/config +++ b/projects/pion-transport/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/transport -git_hash: 95bf2d4e3f04b8d658048d1de02b30a27c8acc18 # v0.8.10 +git_hash: 1d35d73d3858e1d4f2d0bb9f1da455f4731541b4 #v0.12.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,6 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/transport go_lib_deps: + - goxnet - pion-logging - testify go_lib_install: @@ -18,11 +19,12 @@ var: - github.com/pion/transport/test - github.com/pion/transport/vnet - input_files: - project: container-image - name: go project: go + - name: goxnet + project: goxnet - name: pion-logging project: pion-logging - name: testify diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 44d81c0..d8664f9 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: b54907e0b25fb5eea5d860ac61f1bf41ea8a6b01 # v2.0.3 +git_hash: 73942c387bd12c0d200bb0c6813421cb352cf77c #v2.0.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,7 @@ var: go_lib: github.com/pion/turn go_lib_deps: - pion-logging + - pion-randutil - pion-stun - pion-transport - testify @@ -22,6 +23,8 @@ input_files: project: go - name: pion-logging project: pion-logging + - name: pion-randutil + project: pion-randutil - name: pion-stun project: pion-stun - name: pion-transport diff --git a/projects/pion-udp/config b/projects/pion-udp/config new file mode 100644 index 0000000..0da6024 --- /dev/null +++ b/projects/pion-udp/config @@ -0,0 +1,21 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pion/udp +git_hash: adf622c7c621d642f4a954948fc557c5727268d6 #v0.1.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/pion/udp + go_lib_deps: + - pion-transport + +input_files: + - project: container-image + - name: go + project: go + - name: pion-transport + project: pion-transport diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index f4bde82..e63b6fe 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 1f448413f22d6c32d690db594748d8ad5d3812f5 # v2.2.3 +git_hash: a54b74cdb736d07a6014da939fd0bac6d5fc4137 #v3.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -9,13 +9,16 @@ build: '[% c("projects/go/var/build_go_lib") %]' var: container: use_container: 1 - go_lib: github.com/pion/webrtc + go_lib: github.com/pion/webrtc/v3 go_lib_deps: - agouti + - goxnet - pion-datachannel - pion-dtls - pion-ice + - pion-interceptor - pion-logging + - pion-randutil - pion-rtcp - pion-rtp - pion-sctp @@ -30,14 +33,20 @@ input_files: project: go - name: agouti project: agouti + - name: goxnet + project: goxnet - name: pion-datachannel project: pion-datachannel - name: pion-dtls project: pion-dtls - name: pion-ice project: pion-ice + - name: pion-interceptor + project: pion-interceptor - name: pion-logging project: pion-logging + - name: pion-randutil + project: pion-randutil - name: pion-rtcp project: pion-rtcp - name: pion-rtp diff --git a/projects/snowflake/config b/projects/snowflake/config index 80be812..95ef549 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: ece43cbfcfc328bf0d45ee1ce5998ea295035af4 +git_hash: 1b29ad7de14fb0a6d2bf88aea38353733682cd26 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: diff --git a/projects/testify/config b/projects/testify/config index bbb82c3..00d98b8 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify -git_hash: 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9 # v1.5.1 +git_hash: acba37e5db06f0093b465a7d47822bf13644b66c #v1.7.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/uuid/config b/projects/uuid/config new file mode 100644 index 0000000..a7ce469 --- /dev/null +++ b/projects/uuid/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/google/uuid +git_hash: b5d0d36c983b13c35a93a356a9d2c14da0a1c3ab #v1.1.5 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/google/uuid + +input_files: + - project: container-image + - name: go + project: go

1 0

[tor-browser-build/master] Merge branch '!204_rebased'
by gk＠torproject.org 04 Feb '21

04 Feb '21

commit a566a3725ad9437bde3ceb5a6ad6cd7aff6f8673 Merge: 247a313 7e305c4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Feb 4 14:49:52 2021 +0000 Merge branch '!204_rebased' projects/goxxerrors/config | 2 +- projects/goyaml/config | 4 ++-- projects/pion-datachannel/config | 2 +- projects/pion-dtls/config | 5 ++++- projects/pion-ice/config | 8 +++++++- projects/pion-interceptor/config | 30 ++++++++++++++++++++++++++++++ projects/pion-randutil/config | 17 +++++++++++++++++ projects/pion-rtcp/config | 2 +- projects/pion-rtp/config | 8 ++++---- projects/pion-sctp/config | 5 ++++- projects/pion-sdp/config | 5 ++++- projects/pion-srtp/config | 5 +---- projects/pion-transport/config | 6 ++++-- projects/pion-turn/config | 5 ++++- projects/pion-udp/config | 21 +++++++++++++++++++++ projects/pion-webrtc/config | 13 +++++++++++-- projects/snowflake/config | 2 +- projects/testify/config | 2 +- projects/uuid/config | 17 +++++++++++++++++ 19 files changed, 135 insertions(+), 24 deletions(-)

1 0

[Git][tpo/applications/fenix][tor-browser-85.1.0-10.5-1] 2 commits: Bug 40109: Reduce requested permissions
by Matthew Finkel 03 Feb '21

03 Feb '21

Matthew Finkel pushed to branch tor-browser-85.1.0-10.5-1 at The Tor Project / Applications / fenix Commits: 9951b3da by Matthew Finkel at 2021-01-27T23:19:21+00:00 Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - dd2dbe8e by Matthew Finkel at 2021-02-03T00:05:46+00:00 Merge branch 'bug_40109_01' into tor-browser-85.1.0-10.5-1 - - - - - 4 changed files: - app/src/main/AndroidManifest.xml - app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt - app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt - app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt Changes: ===================================== app/src/main/AndroidManifest.xml ===================================== @@ -4,11 +4,8 @@ package="org.mozilla.fenix"> <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> ===================================== app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt ===================================== @@ -49,7 +49,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable AUTOPLAY_AUDIBLE -> when (settings?.getAutoplayUserSetting(default = AUTOPLAY_BLOCK_ALL) ?: AUTOPLAY_BLOCK_ALL) { AUTOPLAY_ALLOW_ALL -> R.string.preference_option_autoplay_allowed2 - AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2 + // AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2 AUTOPLAY_BLOCK_AUDIBLE -> R.string.preference_option_autoplay_block_audio2 AUTOPLAY_BLOCK_ALL -> R.string.preference_option_autoplay_blocked3 else -> R.string.preference_option_autoplay_blocked3 @@ -116,6 +116,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable return when (this) { AUTOPLAY_AUDIBLE -> SitePermissionsRules.Action.BLOCKED AUTOPLAY_INAUDIBLE -> SitePermissionsRules.Action.ALLOWED + LOCATION -> SitePermissionsRules.Action.BLOCKED else -> SitePermissionsRules.Action.ASK_TO_ALLOW } } ===================================== app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt ===================================== @@ -52,6 +52,7 @@ class SitePermissionsFragment : PreferenceFragmentCompat() { // Autoplay inaudible should be set in the same menu as autoplay audible, so it does // not need to be bound .filter { it != PhoneFeature.AUTOPLAY_INAUDIBLE } + .filter { it != PhoneFeature.LOCATION } .forEach(::initPhoneFeature) } ===================================== app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt ===================================== @@ -115,6 +115,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() { saveActionInSettings(AUTOPLAY_ALLOW_ALL) } restoreState(AUTOPLAY_ALLOW_ON_WIFI) + visibility = View.GONE } else { text = getString(R.string.preference_option_phone_feature_blocked) setOnClickListener { View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/a6c84e3e91a7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/a6c84e3e91a7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-86.0.0b1-10.5-1] 2 commits: squash! Modify UI/UX
by Matthew Finkel 02 Feb '21

02 Feb '21

Matthew Finkel pushed to branch tor-browser-86.0.0b1-10.5-1 at The Tor Project / Applications / fenix Commits: 26e874f9 by Matthew Finkel at 2021-02-03T00:06:15+00:00 squash! Modify UI/UX Bug 40141: Hide EME site permission - - - - - 1acf180b by Matthew Finkel at 2021-02-03T00:06:16+00:00 Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - 7 changed files: - app/src/main/AndroidManifest.xml - app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt - app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt - app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt - app/src/main/res/layout/quicksettings_permissions.xml - app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml - app/src/main/res/xml/site_permissions_preferences.xml Changes: ===================================== app/src/main/AndroidManifest.xml ===================================== @@ -4,11 +4,8 @@ package="org.mozilla.fenix"> <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" /> ===================================== app/src/main/java/org/mozilla/fenix/settings/PhoneFeature.kt ===================================== @@ -50,7 +50,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable AUTOPLAY_AUDIBLE -> when (settings?.getAutoplayUserSetting(default = AUTOPLAY_BLOCK_ALL) ?: AUTOPLAY_BLOCK_ALL) { AUTOPLAY_ALLOW_ALL -> R.string.preference_option_autoplay_allowed2 - AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2 + // AUTOPLAY_ALLOW_ON_WIFI -> R.string.preference_option_autoplay_allowed_wifi_only2 AUTOPLAY_BLOCK_AUDIBLE -> R.string.preference_option_autoplay_block_audio2 AUTOPLAY_BLOCK_ALL -> R.string.preference_option_autoplay_blocked3 else -> R.string.preference_option_autoplay_blocked3 @@ -119,6 +119,7 @@ enum class PhoneFeature(val androidPermissionsList: Array<String>) : Parcelable return when (this) { AUTOPLAY_AUDIBLE -> SitePermissionsRules.Action.BLOCKED AUTOPLAY_INAUDIBLE -> SitePermissionsRules.Action.ALLOWED + LOCATION -> SitePermissionsRules.Action.BLOCKED else -> SitePermissionsRules.Action.ASK_TO_ALLOW } } ===================================== app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsFragment.kt ===================================== @@ -52,6 +52,7 @@ class SitePermissionsFragment : PreferenceFragmentCompat() { // Autoplay inaudible should be set in the same menu as autoplay audible, so it does // not need to be bound .filter { it != PhoneFeature.AUTOPLAY_INAUDIBLE } + .filter { it != PhoneFeature.LOCATION } .forEach(::initPhoneFeature) } ===================================== app/src/main/java/org/mozilla/fenix/settings/sitepermissions/SitePermissionsManagePhoneFeatureFragment.kt ===================================== @@ -115,6 +115,7 @@ class SitePermissionsManagePhoneFeatureFragment : Fragment() { saveActionInSettings(AUTOPLAY_ALLOW_ALL) } restoreState(AUTOPLAY_ALLOW_ON_WIFI) + visibility = View.GONE } else { text = getString(R.string.preference_option_phone_feature_blocked) setOnClickListener { ===================================== app/src/main/res/layout/quicksettings_permissions.xml ===================================== @@ -148,7 +148,7 @@ app:layout_constraintBottom_toTopOf="@id/autoplayLabel" app:layout_constraintEnd_toStartOf="@id/mediaKeySystemAccessStatus" app:layout_constraintStart_toStartOf="parent" - tools:visibility="visible" /> + tools:visibility="gone" /> <TextView android:id="@+id/mediaKeySystemAccessStatus" @@ -160,7 +160,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/mediaKeySystemAccessLabel" tools:text="@string/preference_option_phone_feature_blocked" - tools:visibility="visible" /> + tools:visibility="gone" /> <TextView ===================================== app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml ===================================== @@ -3,7 +3,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <androidx.preference.PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > <androidx.preference.Preference android:icon="@drawable/ic_camera_enabled" android:key="@string/pref_key_phone_feature_camera" @@ -38,6 +39,7 @@ android:icon="@drawable/ic_link" android:key="@string/pref_key_browser_feature_media_key_system_access" android:title="@string/preference_phone_feature_media_key_system_access" + app:isPreferenceVisible="false" android:summary="@string/preference_option_phone_feature_ask_to_allow"/> <androidx.preference.Preference ===================================== app/src/main/res/xml/site_permissions_preferences.xml ===================================== @@ -48,6 +48,7 @@ android:key="@string/pref_key_browser_feature_media_key_system_access" android:title="@string/preference_phone_feature_media_key_system_access" android:summary="@string/preference_option_phone_feature_ask_to_allow" + app:isPreferenceVisible="false" app:allowDividerBelow="true"/> <androidx.preference.Preference View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/d95db65de4e9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/d95db65de4e9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-85.1.0-10.5-1] squash! Modify UI/UX
by Matthew Finkel 02 Feb '21

02 Feb '21

Matthew Finkel pushed to branch tor-browser-85.1.0-10.5-1 at The Tor Project / Applications / fenix Commits: a6c84e3e by Matthew Finkel at 2021-01-27T18:00:31+00:00 squash! Modify UI/UX Bug 40141: Hide EME site permission - - - - - 3 changed files: - app/src/main/res/layout/quicksettings_permissions.xml - app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml - app/src/main/res/xml/site_permissions_preferences.xml Changes: ===================================== app/src/main/res/layout/quicksettings_permissions.xml ===================================== @@ -148,7 +148,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/mediaKeySystemAccessStatus" app:layout_constraintStart_toStartOf="parent" - tools:visibility="visible" /> + tools:visibility="gone" /> <TextView android:id="@+id/mediaKeySystemAccessStatus" @@ -160,6 +160,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/mediaKeySystemAccessLabel" tools:text="@string/preference_option_phone_feature_blocked" - tools:visibility="visible" /> + tools:visibility="gone" /> </androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml ===================================== @@ -3,7 +3,8 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <androidx.preference.PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > <androidx.preference.Preference android:icon="@drawable/ic_camera_enabled" android:key="@string/pref_key_phone_feature_camera" @@ -38,6 +39,7 @@ android:icon="@drawable/ic_link" android:key="@string/pref_key_browser_feature_media_key_system_access" android:title="@string/preference_phone_feature_media_key_system_access" + app:isPreferenceVisible="false" android:summary="@string/preference_option_phone_feature_ask_to_allow"/> <androidx.preference.Preference ===================================== app/src/main/res/xml/site_permissions_preferences.xml ===================================== @@ -48,6 +48,7 @@ android:key="@string/pref_key_browser_feature_media_key_system_access" android:title="@string/preference_phone_feature_media_key_system_access" android:summary="@string/preference_option_phone_feature_ask_to_allow" + app:isPreferenceVisible="false" app:allowDividerBelow="true"/> <androidx.preference.Preference View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/a6c84e3e91a7c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/a6c84e3e91a7c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-86.0.0b2-10.5-1
by Matthew Finkel 02 Feb '21

02 Feb '21

Matthew Finkel pushed new branch tor-browser-86.0.0b2-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-86.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser/tor-browser-86.0b1-10.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 5877ec7fc831ef8d405e280155f61317d249fbbe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 08:03:10 2021 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 40308: Disable network partitioning until we evaluate dFPI --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 19991a801fcd..5ffdc386042b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -190,6 +190,7 @@ pref("media.videocontrols.picture-in-picture.enabled", false); // Bug 40148: dis // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation +pref("privacy.partition.network_state", false); // Disable for now until audit pref("network.cookie.cookieBehavior", 1); pref("network.http.spdy.allow-push", false); // Disabled for now. See https://bugs.torproject.org/27127 pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

1 0

[tor-browser-build/maint-10.0-android] Tag 10.0.10 build2
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit bb188bd399f89e8c1d97fc3778039d2d2201e459 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Feb 2 23:25:51 2021 +0000 Tag 10.0.10 build2 --- projects/geckoview/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 45fadb4..110cc9d 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c9e8c52..e99a372 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -3,6 +3,7 @@ Tor Browser 10.0.10 -- February 3 2021 * Update NoScript to 11.2 * Update HTTPS Everywhere to 2021.1.27 * Pick up fix for Mozilla's bug 1688783 + * Pick up fix for Mozilla's bug 1688017 * Bug 40224: Backport Tor patch for v3 onion services [tor-browser-build] Tor Browser 10.0.9 -- January 26 2021 diff --git a/rbm.conf b/rbm.conf index 7b65c5f..73779cd 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0.10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser/tor-browser-85.0-10.0-1] Bug 1688017 - Disable webrender on Mali-G76 devices. r=nical, geckoview-reviewers, agi, a=jcristau
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 6b8b7b5402dfe2051c879aa152d48d37d0b35dc7 Author: Jamie Nicol <jnicol(a)mozilla.com> Date: Mon Jan 25 15:37:31 2021 +0000 Bug 1688017 - Disable webrender on Mali-G76 devices. r=nical,geckoview-reviewers,agi, a=jcristau We're seeing reports of crashes when users attempt to watch video on Mali-G76 devices. Disable webrender for now on Mali-G76 until the underlying problem is identified and fixed. Differential Revision: https://phabricator.services.mozilla.com/D102903 --- widget/android/GfxInfo.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/widget/android/GfxInfo.cpp b/widget/android/GfxInfo.cpp index 6c69e55bab1c..eec3db83aba1 100644 --- a/widget/android/GfxInfo.cpp +++ b/widget/android/GfxInfo.cpp @@ -591,8 +591,10 @@ nsresult GfxInfo::GetFeatureStatusImpl( // Enable Webrender on all Adreno 6xx devices isUnblocked |= gpu.Find("Adreno (TM) 6", /*ignoreCase*/ true) >= 0; - // Enable Webrender on all Mali-Gxx GPUs - isUnblocked |= gpu.Find("Mali-G", /*ignoreCase*/ true) >= 0; + // Enable Webrender on all Mali-Gxx GPUs, excluding G76 due to bug + // 1688017. + isUnblocked |= gpu.Find("Mali-G", /*ignoreCase*/ true) >= 0 && + gpu.Find("Mali-G76", /*ignoreCase*/ true) == kNotFound; if (!isUnblocked) { *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;

1 0

[tor-browser/tor-browser-85.0-10.0-1] Backed out 1 changesets (bug 1674832) for causing frame drops on android (bug 1688783). a=backout
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 9fe53c542e758145dd34e9e037368fcfad3fd3ba Author: Julien Cristau <jcristau(a)mozilla.com> Date: Wed Jan 27 19:22:22 2021 +0100 Backed out 1 changesets (bug 1674832) for causing frame drops on android (bug 1688783). a=backout Backed out changeset 969761f1aa55 (bug 1674832) --- media/libcubeb/aaudio_by_default.patch | 31 ------------------------------- media/libcubeb/src/cubeb.c | 3 --- media/libcubeb/update.sh | 2 -- 3 files changed, 36 deletions(-) diff --git a/media/libcubeb/aaudio_by_default.patch b/media/libcubeb/aaudio_by_default.patch deleted file mode 100644 index b1593268ad54..000000000000 --- a/media/libcubeb/aaudio_by_default.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c ---- a/media/libcubeb/src/cubeb.c -+++ b/media/libcubeb/src/cubeb.c -@@ -227,24 +227,22 @@ cubeb_init(cubeb ** context, char const - wasapi_init, - #endif - #if defined(USE_WINMM) - winmm_init, - #endif - #if defined(USE_SUN) - sun_init, - #endif -+#if defined(USE_AAUDIO) -+ aaudio_init, -+#endif - #if defined(USE_OPENSL) - opensl_init, - #endif -- // TODO: should probably be preferred over OpenSLES when available. -- // Initialization will fail on old android devices. --#if defined(USE_AAUDIO) -- aaudio_init, --#endif - #if defined(USE_AUDIOTRACK) - audiotrack_init, - #endif - #if defined(USE_KAI) - kai_init, - #endif - }; - int i; diff --git a/media/libcubeb/src/cubeb.c b/media/libcubeb/src/cubeb.c index 538e1d06d4a3..25389d1fa42a 100644 --- a/media/libcubeb/src/cubeb.c +++ b/media/libcubeb/src/cubeb.c @@ -232,9 +232,6 @@ cubeb_init(cubeb ** context, char const * context_name, char const * backend_nam #if defined(USE_SUN) sun_init, #endif -#if defined(USE_AAUDIO) - aaudio_init, -#endif #if defined(USE_OPENSL) opensl_init, #endif diff --git a/media/libcubeb/update.sh b/media/libcubeb/update.sh index cd5adfc99247..db775c9d1551 100755 --- a/media/libcubeb/update.sh +++ b/media/libcubeb/update.sh @@ -86,5 +86,3 @@ if [ -n "$rev" ]; then else echo "Remember to update moz.yaml with the version details." fi - -patch -p3 < ./aaudio_by_default.patch

1 0

[tor-browser-build/maint-10.0-android] Bump HTTPS Everywhere version to 2021.1.27
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 22f3db1208fabacd42edd6f6494fea97dc6684e6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 2 08:19:59 2021 +0000 Bump HTTPS Everywhere version to 2021.1.27 --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 255d36f..5ef51dd 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.11.17 +version: 2021.1.27 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[tor-browser-build/maint-10.0-android] Bug 40224: Backport Tor patch for v3 onion services
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 17aa2f20efafb67b707e3827c422182c131816fe Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Feb 1 21:31:46 2021 +0000 Bug 40224: Backport Tor patch for v3 onion services --- ...1-hs-v3-Require-reasonably-live-consensus.patch | 672 +++++++++++++++++++++ ...tests-Fix-unit-tests-after-merge-of-40237.patch | 97 +++ .../0003-Pick-up-merge-conflict-resolutions.patch | 82 +++ projects/tor/build | 4 + projects/tor/config | 3 + 5 files changed, 858 insertions(+) diff --git a/projects/tor/0001-hs-v3-Require-reasonably-live-consensus.patch b/projects/tor/0001-hs-v3-Require-reasonably-live-consensus.patch new file mode 100644 index 0000000..9a4ec5c --- /dev/null +++ b/projects/tor/0001-hs-v3-Require-reasonably-live-consensus.patch @@ -0,0 +1,672 @@ +From a363b64e82bc1dac2409a65dee0606c4b66f71fc Mon Sep 17 00:00:00 2001 +From: David Goulet <dgoulet(a)torproject.org> +Date: Mon, 11 Jan 2021 16:01:22 -0500 +Subject: [PATCH 1/3] hs-v3: Require reasonably live consensus + +Some days before this commit, the network experienced a DDoS on the directory +authorities that prevented them to generate a consensus for more than 5 hours +straight. + +That in turn entirely disabled onion service v3, client and service side, due +to the subsystem requiring a live consensus to function properly. + +We know require a reasonably live consensus which means that the HSv3 +subsystem will to its job for using the best consensus tor can find. If the +entire network is using an old consensus, than this should be alright. + +If the service happens to use a live consensus while a client is not, it +should still work because the client will use the current SRV it sees which +might be the previous SRV for the service for which it still publish +descriptors for. + +If the service is using an old one and somehow can't get a new one while +clients are on a new one, then reachability issues might arise. However, this +is a situation we already have at the moment since the service will simply not +work if it doesn't have a live consensus while a client has one. + +Fixes #40237 + +Signed-off-by: David Goulet <dgoulet(a)torproject.org> + +diff --git a/changes/ticket40237 b/changes/ticket40237 +new file mode 100644 +index 0000000000..fc32f59cd4 +--- /dev/null ++++ b/changes/ticket40237 +@@ -0,0 +1,5 @@ ++ o Major bugfixes (onion service v3): ++ - Stop requiring a live consensus for v3 clients and services to work. The ++ use of a reasonably live consensus will allow v3 to work properly in most ++ cases if the network failed to generate a consensus for more than 2 hours ++ in a row. Fixes bug 40237; bugfix on 0.3.5.1-alpha. +diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c +index e4e17f6b76..b4dbedbfe4 100644 +--- a/src/core/mainloop/mainloop.c ++++ b/src/core/mainloop/mainloop.c +@@ -2154,7 +2154,8 @@ hs_service_callback(time_t now, const or_options_t *options) + /* We need to at least be able to build circuits and that we actually have + * a working network. */ + if (!have_completed_a_circuit() || net_is_disabled() || +- networkstatus_get_live_consensus(now) == NULL) { ++ !networkstatus_get_reasonably_live_consensus(now, ++ usable_consensus_flavor())) { + goto end; + } + +diff --git a/src/feature/hs/hs_cache.c b/src/feature/hs/hs_cache.c +index 44cd2505fd..ef5e88e947 100644 +--- a/src/feature/hs/hs_cache.c ++++ b/src/feature/hs/hs_cache.c +@@ -17,6 +17,7 @@ + #include "feature/hs/hs_common.h" + #include "feature/hs/hs_client.h" + #include "feature/hs/hs_descriptor.h" ++#include "feature/nodelist/microdesc.h" + #include "feature/nodelist/networkstatus.h" + #include "feature/rend/rendcache.h" + +@@ -739,7 +740,9 @@ cached_client_descriptor_has_expired(time_t now, + /* We use the current consensus time to see if we should expire this + * descriptor since we use consensus time for all other parts of the protocol + * as well (e.g. to build the blinded key and compute time periods). */ +- const networkstatus_t *ns = networkstatus_get_live_consensus(now); ++ const networkstatus_t *ns = ++ networkstatus_get_reasonably_live_consensus(now, ++ usable_consensus_flavor()); + /* If we don't have a recent consensus, consider this entry expired since we + * will want to fetch a new HS desc when we get a live consensus. */ + if (!ns) { +diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c +index fc1fd76efc..0f6109195b 100644 +--- a/src/feature/hs/hs_client.c ++++ b/src/feature/hs/hs_client.c +@@ -29,6 +29,7 @@ + #include "feature/hs/hs_descriptor.h" + #include "feature/hs/hs_ident.h" + #include "feature/nodelist/describe.h" ++#include "feature/nodelist/microdesc.h" + #include "feature/nodelist/networkstatus.h" + #include "feature/nodelist/nodelist.h" + #include "feature/nodelist/routerset.h" +@@ -1302,9 +1303,10 @@ can_client_refetch_desc(const ed25519_public_key_t *identity_pk, + goto cannot; + } + +- /* Without a live consensus we can't do any client actions. It is needed to +- * compute the hashring for a service. */ +- if (!networkstatus_get_live_consensus(approx_time())) { ++ /* Without a usable consensus we can't do any client actions. It is needed ++ * to compute the hashring for a service. */ ++ if (!networkstatus_get_reasonably_live_consensus(approx_time(), ++ usable_consensus_flavor())) { + log_info(LD_REND, "Can't fetch descriptor for service %s because we " + "are missing a live consensus. Stalling connection.", + safe_str_client(ed25519_fmt(identity_pk))); +diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c +index 4639cdb68a..86d3fcab7d 100644 +--- a/src/feature/hs/hs_common.c ++++ b/src/feature/hs/hs_common.c +@@ -27,6 +27,7 @@ + #include "feature/hs/hs_service.h" + #include "feature/hs_common/shared_random_client.h" + #include "feature/nodelist/describe.h" ++#include "feature/nodelist/microdesc.h" + #include "feature/nodelist/networkstatus.h" + #include "feature/nodelist/nodelist.h" + #include "feature/nodelist/routerset.h" +@@ -276,7 +277,9 @@ hs_get_time_period_num(time_t now) + if (now != 0) { + current_time = now; + } else { +- networkstatus_t *ns = networkstatus_get_live_consensus(approx_time()); ++ networkstatus_t *ns = ++ networkstatus_get_reasonably_live_consensus(approx_time(), ++ usable_consensus_flavor()); + current_time = ns ? ns->valid_after : approx_time(); + } + +@@ -1107,7 +1110,8 @@ hs_in_period_between_tp_and_srv,(const networkstatus_t *consensus, time_t now)) + time_t srv_start_time, tp_start_time; + + if (!consensus) { +- consensus = networkstatus_get_live_consensus(now); ++ consensus = networkstatus_get_reasonably_live_consensus(now, ++ usable_consensus_flavor()); + if (!consensus) { + return 0; + } +@@ -1352,7 +1356,9 @@ hs_get_responsible_hsdirs(const ed25519_public_key_t *blinded_pk, + sorted_nodes = smartlist_new(); + + /* Make sure we actually have a live consensus */ +- networkstatus_t *c = networkstatus_get_live_consensus(approx_time()); ++ networkstatus_t *c = ++ networkstatus_get_reasonably_live_consensus(approx_time(), ++ usable_consensus_flavor()); + if (!c || smartlist_len(c->routerstatus_list) == 0) { + log_warn(LD_REND, "No live consensus so we can't get the responsible " + "hidden service directories."); +diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c +index a42879a48f..2f3f45f252 100644 +--- a/src/feature/hs/hs_service.c ++++ b/src/feature/hs/hs_service.c +@@ -23,6 +23,7 @@ + #include "feature/hs_common/shared_random_client.h" + #include "feature/keymgt/loadkey.h" + #include "feature/nodelist/describe.h" ++#include "feature/nodelist/microdesc.h" + #include "feature/nodelist/networkstatus.h" + #include "feature/nodelist/nickname.h" + #include "feature/nodelist/node_select.h" +@@ -2504,7 +2505,8 @@ should_rotate_descriptors(hs_service_t *service, time_t now) + + tor_assert(service); + +- ns = networkstatus_get_live_consensus(now); ++ ns = networkstatus_get_reasonably_live_consensus(now, ++ usable_consensus_flavor()); + if (ns == NULL) { + goto no_rotation; + } +@@ -3188,10 +3190,8 @@ should_service_upload_descriptor(const hs_service_t *service, + } + + /* Don't upload desc if we don't have a live consensus */ +- if (!networkstatus_get_live_consensus(now)) { +- msg = tor_strdup("No live consensus"); +- log_cant_upload_desc(service, desc, msg, +- LOG_DESC_UPLOAD_REASON_NO_LIVE_CONSENSUS); ++ if (!networkstatus_get_reasonably_live_consensus(now, ++ usable_consensus_flavor())) { + goto cannot; + } + +diff --git a/src/feature/hs_common/shared_random_client.c b/src/feature/hs_common/shared_random_client.c +index c2ea5afe32..4e8a2942fc 100644 +--- a/src/feature/hs_common/shared_random_client.c ++++ b/src/feature/hs_common/shared_random_client.c +@@ -13,6 +13,7 @@ + #include "app/config/config.h" + #include "feature/dirauth/authmode.h" + #include "feature/dirauth/voting_schedule.h" ++#include "feature/nodelist/microdesc.h" + #include "feature/nodelist/networkstatus.h" + #include "lib/encoding/binascii.h" + +@@ -55,7 +56,9 @@ int + get_voting_interval(void) + { + int interval; +- networkstatus_t *consensus = networkstatus_get_live_consensus(time(NULL)); ++ networkstatus_t *consensus = ++ networkstatus_get_reasonably_live_consensus(time(NULL), ++ usable_consensus_flavor()); + + if (consensus) { + /* Ideally we have a live consensus and we can just use that. */ +@@ -147,7 +150,8 @@ sr_get_current(const networkstatus_t *ns) + if (ns) { + consensus = ns; + } else { +- consensus = networkstatus_get_live_consensus(approx_time()); ++ consensus = networkstatus_get_reasonably_live_consensus(approx_time(), ++ usable_consensus_flavor()); + } + /* Ideally we would never be asked for an SRV without a live consensus. Make + * sure this assumption is correct. */ +@@ -170,7 +174,8 @@ sr_get_previous(const networkstatus_t *ns) + if (ns) { + consensus = ns; + } else { +- consensus = networkstatus_get_live_consensus(approx_time()); ++ consensus = networkstatus_get_reasonably_live_consensus(approx_time(), ++ usable_consensus_flavor()); + } + /* Ideally we would never be asked for an SRV without a live consensus. Make + * sure this assumption is correct. */ +@@ -242,13 +247,14 @@ sr_state_get_start_time_of_current_protocol_run(void) + int voting_interval = get_voting_interval(); + time_t beginning_of_curr_round; + +- /* This function is not used for voting purposes, so if we have a live +- consensus, use its valid-after as the beginning of the current round. +- If we have no consensus but we're an authority, use our own +- schedule. Otherwise, try using our view of the voting interval +- to figure out when the current round _should_ be starting. +- */ +- networkstatus_t *ns = networkstatus_get_live_consensus(approx_time()); ++ /* This function is not used for voting purposes, so if we have a reasonably ++ * live consensus, use its valid-after as the beginning of the current ++ * round. If we have no consensus but we're an authority, use our own ++ * schedule. Otherwise, try using our view of the voting interval to figure ++ * out when the current round _should_ be starting. */ ++ networkstatus_t *ns = ++ networkstatus_get_reasonably_live_consensus(approx_time(), ++ usable_consensus_flavor()); + if (ns) { + beginning_of_curr_round = ns->valid_after; + } else if (authdir_mode(get_options()) || ASSUME_AUTHORITY_SCHEDULING) { +diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c +index 7454f342f9..6ee1d11cae 100644 +--- a/src/feature/nodelist/nodelist.c ++++ b/src/feature/nodelist/nodelist.c +@@ -362,7 +362,7 @@ node_set_hsdir_index(node_t *node, const networkstatus_t *ns) + tor_assert(node); + tor_assert(ns); + +- if (!networkstatus_is_live(ns, now)) { ++ if (!networkstatus_consensus_reasonably_live(ns, now)) { + static struct ratelim_t live_consensus_ratelim = RATELIM_INIT(30 * 60); + log_fn_ratelim(&live_consensus_ratelim, LOG_INFO, LD_GENERAL, + "Not setting hsdir index with a non-live consensus."); +diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c +index f25bba3584..379f23ec72 100644 +--- a/src/test/test_hs_cache.c ++++ b/src/test/test_hs_cache.c +@@ -462,9 +462,10 @@ test_hsdir_revision_counter_check(void *arg) + static networkstatus_t mock_ns; + + static networkstatus_t * +-mock_networkstatus_get_live_consensus(time_t now) ++mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + return &mock_ns; + } + +@@ -485,8 +486,8 @@ test_client_cache(void *arg) + /* Initialize HSDir cache subsystem */ + init_test(); + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* Set consensus time */ + parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", +diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c +index ae5cc5ed84..fd84293dc2 100644 +--- a/src/test/test_hs_client.c ++++ b/src/test/test_hs_client.c +@@ -66,16 +66,18 @@ static networkstatus_t mock_ns; + + /* Always return NULL. */ + static networkstatus_t * +-mock_networkstatus_get_live_consensus_false(time_t now) ++mock_networkstatus_get_reasonably_live_consensus_false(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + return NULL; + } + + static networkstatus_t * +-mock_networkstatus_get_live_consensus(time_t now) ++mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + return &mock_ns; + } + +@@ -379,8 +381,8 @@ test_client_pick_intro(void *arg) + ed25519_keypair_t service_kp; + hs_descriptor_t *desc = NULL; + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + (void) arg; + +@@ -632,15 +634,15 @@ test_descriptor_fetch(void *arg) + get_options_mutable()->FetchHidServDescriptors = 1; + + /* 2. We don't have a live consensus. */ +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus_false); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus_false); + ret = hs_client_refetch_hsdesc(&service_pk); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + tt_int_op(ret, OP_EQ, HS_CLIENT_FETCH_MISSING_INFO); + + /* From now on, return a live consensus. */ +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* 3. Not enough dir information. */ + MOCK(router_have_minimum_dir_info, +@@ -682,7 +684,7 @@ test_descriptor_fetch(void *arg) + + done: + connection_free_minimal(ENTRY_TO_CONN(ec)); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + UNMOCK(router_have_minimum_dir_info); + hs_free_all(); + } +@@ -880,8 +882,8 @@ test_desc_has_arrived_cleanup(void *arg) + + hs_init(); + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + MOCK(connection_mark_unattached_ap_, + mock_connection_mark_unattached_ap_); + MOCK(router_have_minimum_dir_info, +@@ -953,7 +955,7 @@ test_desc_has_arrived_cleanup(void *arg) + tor_free(desc_str); + hs_free_all(); + +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + UNMOCK(connection_mark_unattached_ap_); + UNMOCK(router_have_minimum_dir_info); + } +@@ -974,8 +976,8 @@ test_close_intro_circuits_new_desc(void *arg) + + /* This is needed because of the client cache expiration timestamp is based + * on having a consensus. See cached_client_descriptor_has_expired(). */ +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* Set consensus time */ + parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", +@@ -1101,7 +1103,7 @@ test_close_intro_circuits_new_desc(void *arg) + hs_descriptor_free(desc1); + hs_descriptor_free(desc2); + hs_free_all(); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + static void +diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c +index 9202074e25..e3d130fb32 100644 +--- a/src/test/test_hs_common.c ++++ b/src/test/test_hs_common.c +@@ -360,9 +360,10 @@ mock_networkstatus_get_latest_consensus(void) + } + + static networkstatus_t * +-mock_networkstatus_get_live_consensus(time_t now) ++mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + + tt_assert(mock_ns); + +@@ -382,6 +383,8 @@ test_responsible_hsdirs(void *arg) + + MOCK(networkstatus_get_latest_consensus, + mock_networkstatus_get_latest_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + ns = networkstatus_get_latest_consensus(); + +@@ -418,6 +421,8 @@ test_responsible_hsdirs(void *arg) + smartlist_clear(ns->routerstatus_list); + networkstatus_vote_free(mock_ns); + cleanup_nodelist(); ++ ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + static void +@@ -467,6 +472,8 @@ test_desc_reupload_logic(void *arg) + + hs_init(); + ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + MOCK(router_have_minimum_dir_info, + mock_router_have_minimum_dir_info); + MOCK(get_or_state, +@@ -911,9 +918,11 @@ static smartlist_t *service_responsible_hsdirs = NULL; + static smartlist_t *client_responsible_hsdirs = NULL; + + static networkstatus_t * +-mock_networkstatus_get_live_consensus_service(time_t now) ++mock_networkstatus_get_reasonably_live_consensus_service(time_t now, ++ int flavor) + { + (void) now; ++ (void) flavor; + + if (mock_service_ns) { + return mock_service_ns; +@@ -929,13 +938,14 @@ mock_networkstatus_get_live_consensus_service(time_t now) + static networkstatus_t * + mock_networkstatus_get_latest_consensus_service(void) + { +- return mock_networkstatus_get_live_consensus_service(0); ++ return mock_networkstatus_get_reasonably_live_consensus_service(0, 0); + } + + static networkstatus_t * +-mock_networkstatus_get_live_consensus_client(time_t now) ++mock_networkstatus_get_reasonably_live_consensus_client(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + + if (mock_client_ns) { + return mock_client_ns; +@@ -951,7 +961,7 @@ mock_networkstatus_get_live_consensus_client(time_t now) + static networkstatus_t * + mock_networkstatus_get_latest_consensus_client(void) + { +- return mock_networkstatus_get_live_consensus_client(0); ++ return mock_networkstatus_get_reasonably_live_consensus_client(0, 0); + } + + /* Mock function because we are not trying to test the close circuit that does +@@ -1411,8 +1421,8 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) + * === Client setup === + */ + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus_client); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus_client); + MOCK(networkstatus_get_latest_consensus, + mock_networkstatus_get_latest_consensus_client); + +@@ -1436,14 +1446,14 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) + tt_int_op(smartlist_len(client_responsible_hsdirs), OP_EQ, 6); + + UNMOCK(networkstatus_get_latest_consensus); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + + /* + * === Service setup === + */ + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus_service); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus_service); + MOCK(networkstatus_get_latest_consensus, + mock_networkstatus_get_latest_consensus_service); + +@@ -1470,7 +1480,7 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario) + tt_int_op(smartlist_len(service_responsible_hsdirs), OP_EQ, 8); + + UNMOCK(networkstatus_get_latest_consensus); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + + /* Some testing of the values we just got from the client and service. */ + tt_mem_op(&client_blinded_pk, OP_EQ, &service_blinded_pk, +@@ -1721,8 +1731,8 @@ test_client_service_hsdir_set_sync(void *arg) + + MOCK(networkstatus_get_latest_consensus, + mock_networkstatus_get_latest_consensus); +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + MOCK(get_or_state, + get_or_state_replacement); + MOCK(hs_desc_encode_descriptor, +diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c +index 80383baff8..630cfef1fe 100644 +--- a/src/test/test_hs_service.c ++++ b/src/test/test_hs_service.c +@@ -83,9 +83,10 @@ + static networkstatus_t mock_ns; + + static networkstatus_t * +-mock_networkstatus_get_live_consensus(time_t now) ++mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + return &mock_ns; + } + +@@ -1375,8 +1376,8 @@ test_rotate_descriptors(void *arg) + hs_init(); + MOCK(get_or_state, get_or_state_replacement); + MOCK(circuit_mark_for_close_, mock_circuit_mark_for_close); +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* Descriptor rotation happens with a consensus with a new SRV. */ + +@@ -1464,7 +1465,7 @@ test_rotate_descriptors(void *arg) + hs_free_all(); + UNMOCK(get_or_state); + UNMOCK(circuit_mark_for_close_); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + /** Test building descriptors: picking intro points, setting up their link +@@ -1484,8 +1485,8 @@ test_build_update_descriptors(void *arg) + + MOCK(get_or_state, + get_or_state_replacement); +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + dummy_state = or_state_new(); + +@@ -1715,8 +1716,8 @@ test_build_descriptors(void *arg) + + MOCK(get_or_state, + get_or_state_replacement); +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + dummy_state = or_state_new(); + +@@ -1816,8 +1817,8 @@ test_upload_descriptors(void *arg) + hs_init(); + MOCK(get_or_state, + get_or_state_replacement); +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + dummy_state = or_state_new(); + +diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c +index 148eb5cf90..9e49e835c9 100644 +--- a/src/test/test_shared_random.c ++++ b/src/test/test_shared_random.c +@@ -167,6 +167,15 @@ mock_networkstatus_get_live_consensus(time_t now) + return &mock_consensus; + } + ++/* Mock function to immediately return our local 'mock_consensus'. */ ++static networkstatus_t * ++mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) ++{ ++ (void) now; ++ (void) flavor; ++ return &mock_consensus; ++} ++ + static void + test_get_state_valid_until_time(void *arg) + { +@@ -179,6 +188,8 @@ test_get_state_valid_until_time(void *arg) + + MOCK(networkstatus_get_live_consensus, + mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC", + &mock_consensus.fresh_until); +@@ -235,7 +246,7 @@ test_get_state_valid_until_time(void *arg) + } + + done: +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + /** Test the function that calculates the start time of the current SRV +@@ -251,6 +262,8 @@ test_get_start_time_of_current_run(void *arg) + + MOCK(networkstatus_get_live_consensus, + mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC", + &mock_consensus.fresh_until); +@@ -335,6 +348,7 @@ test_get_start_time_of_current_run(void *arg) + /* Next test is testing it without a consensus to use the testing voting + * interval . */ + UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + + /* Now let's alter the voting schedule and check the correctness of the + * function. Voting interval of 10 seconds, means that an SRV protocol run +@@ -366,8 +380,8 @@ test_get_start_time_functions(void *arg) + (void) arg; + int retval; + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + retval = parse_rfc1123_time("Mon, 20 Apr 2015 01:00:00 UTC", + &mock_consensus.fresh_until); +@@ -388,7 +402,7 @@ test_get_start_time_functions(void *arg) + start_time_of_protocol_run); + + done: +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + static void +-- +2.25.1 + diff --git a/projects/tor/0002-tests-Fix-unit-tests-after-merge-of-40237.patch b/projects/tor/0002-tests-Fix-unit-tests-after-merge-of-40237.patch new file mode 100644 index 0000000..32e6812 --- /dev/null +++ b/projects/tor/0002-tests-Fix-unit-tests-after-merge-of-40237.patch @@ -0,0 +1,97 @@ +From 10acc0ce99283ed0aa5c6c5d203f1b0514e60f4a Mon Sep 17 00:00:00 2001 +From: David Goulet <dgoulet(a)torproject.org> +Date: Tue, 12 Jan 2021 10:50:01 -0500 +Subject: [PATCH 2/3] tests: Fix unit tests after merge of #40237 + + +diff --git a/src/test/test_hs_cache.c b/src/test/test_hs_cache.c +index 379f23ec72..df96b2c791 100644 +--- a/src/test/test_hs_cache.c ++++ b/src/test/test_hs_cache.c +@@ -590,8 +590,8 @@ test_client_cache_decrypt(void *arg) + /* Initialize HSDir cache subsystem */ + hs_init(); + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* Set consensus time */ + parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", +@@ -646,7 +646,7 @@ test_client_cache_decrypt(void *arg) + + hs_free_all(); + +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + static void +@@ -660,8 +660,8 @@ test_client_cache_remove(void *arg) + + hs_init(); + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* Set consensus time. Lookup will not return the entry if it has expired + * and it is checked against the consensus valid_after time. */ +@@ -699,7 +699,7 @@ test_client_cache_remove(void *arg) + hs_descriptor_free(desc1); + hs_free_all(); + +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + struct testcase_t hs_cache[] = { +diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c +index fd84293dc2..0cd7d81eea 100644 +--- a/src/test/test_hs_client.c ++++ b/src/test/test_hs_client.c +@@ -1122,8 +1122,8 @@ test_close_intro_circuits_cache_clean(void *arg) + + /* This is needed because of the client cache expiration timestamp is based + * on having a consensus. See cached_client_descriptor_has_expired(). */ +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + /* Set consensus time */ + parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", +@@ -1188,7 +1188,7 @@ test_close_intro_circuits_cache_clean(void *arg) + hs_descriptor_free(desc1); + hs_free_all(); + rend_cache_free_all(); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + } + + static void +@@ -1209,8 +1209,8 @@ test_socks_hs_errors(void *arg) + + (void) arg; + +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + MOCK(connection_mark_unattached_ap_, + mock_connection_mark_unattached_ap_no_close); + MOCK(read_file_to_str, mock_read_file_to_str); +@@ -1358,7 +1358,7 @@ test_socks_hs_errors(void *arg) + + hs_free_all(); + +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + UNMOCK(connection_mark_unattached_ap_); + UNMOCK(read_file_to_str); + UNMOCK(tor_listdir); +-- +2.25.1 + diff --git a/projects/tor/0003-Pick-up-merge-conflict-resolutions.patch b/projects/tor/0003-Pick-up-merge-conflict-resolutions.patch new file mode 100644 index 0000000..dcc8b52 --- /dev/null +++ b/projects/tor/0003-Pick-up-merge-conflict-resolutions.patch @@ -0,0 +1,82 @@ +From 2deca96cb8836a95095354cc717e1738f10b8ce1 Mon Sep 17 00:00:00 2001 +From: Matthew Finkel <sysrqb(a)torproject.org> +Date: Mon, 1 Feb 2021 21:03:54 +0000 +Subject: [PATCH 3/3] Pick up merge conflict resolutions + + +diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c +index 2f3f45f252..c29f39c6b4 100644 +--- a/src/feature/hs/hs_service.c ++++ b/src/feature/hs/hs_service.c +@@ -3192,6 +3192,9 @@ should_service_upload_descriptor(const hs_service_t *service, + /* Don't upload desc if we don't have a live consensus */ + if (!networkstatus_get_reasonably_live_consensus(now, + usable_consensus_flavor())) { ++ msg = tor_strdup("No reasonably live consensus"); ++ log_cant_upload_desc(service, desc, msg, ++ LOG_DESC_UPLOAD_REASON_NO_LIVE_CONSENSUS); + goto cannot; + } + +diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c +index 630cfef1fe..8b94bb6cf1 100644 +--- a/src/test/test_hs_service.c ++++ b/src/test/test_hs_service.c +@@ -91,9 +91,10 @@ mock_networkstatus_get_reasonably_live_consensus(time_t now, int flavor) + } + + static networkstatus_t * +-mock_networkstatus_get_live_consensus_null(time_t now) ++mock_networkstatus_get_reasonably_live_consensus_null(time_t now, int flavor) + { + (void) now; ++ (void) flavor; + return NULL; + } + +@@ -2554,8 +2555,8 @@ test_cannot_upload_descriptors(void *arg) + hs_init(); + MOCK(get_or_state, + get_or_state_replacement); +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + + dummy_state = or_state_new(); + +@@ -2631,17 +2632,17 @@ test_cannot_upload_descriptors(void *arg) + + /* 4. Testing missing live consensus. */ + { +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus_null); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus_null); + setup_full_capture_of_logs(LOG_INFO); + run_upload_descriptor_event(now); + expect_log_msg_containing( + "Service [scrubbed] can't upload its current descriptor: " +- "No live consensus"); ++ "No reasonably live consensus"); + teardown_capture_of_logs(); + /* Reset. */ +- MOCK(networkstatus_get_live_consensus, +- mock_networkstatus_get_live_consensus); ++ MOCK(networkstatus_get_reasonably_live_consensus, ++ mock_networkstatus_get_reasonably_live_consensus); + } + + /* 5. Test missing minimum directory information. */ +@@ -2680,7 +2681,7 @@ test_cannot_upload_descriptors(void *arg) + done: + hs_free_all(); + UNMOCK(count_desc_circuit_established); +- UNMOCK(networkstatus_get_live_consensus); ++ UNMOCK(networkstatus_get_reasonably_live_consensus); + UNMOCK(get_or_state); + } + +-- +2.25.1 + diff --git a/projects/tor/build b/projects/tor/build index c7e9190..219301a 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -93,6 +93,10 @@ openssldir=/var/tmp/dist/openssl/openssl [% END %] cd /var/tmp/build/[% project %]-[% c('version') %] +# Patch Tor 0.4.4.6 with the fix for tpo/core/tor#40237 +patch -p1 < $rootdir/0001-hs-v3-Require-reasonably-live-consensus.patch +patch -p1 < $rootdir/0002-tests-Fix-unit-tests-after-merge-of-40237.patch +patch -p1 < $rootdir/0003-Pick-up-merge-conflict-resolutions.patch # add git hash to micro-revision.i for #24995 echo '"[% c("abbrev", { abbrev_length => 16 }) %]"' > micro-revision.i ./autogen.sh diff --git a/projects/tor/config b/projects/tor/config index 3050d7d..1a53d39 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -68,3 +68,6 @@ input_files: - name: zstd project: zstd enable: '[% c("var/android") %]' + - filename: '0001-hs-v3-Require-reasonably-live-consensus.patch' + - filename: '0002-tests-Fix-unit-tests-after-merge-of-40237.patch' + - filename: '0003-Pick-up-merge-conflict-resolutions.patch'

1 0

[tor-browser-build/maint-10.0-android] Bump NoScript version to 11.2
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 0a5c07b8141b99307267c9434bda0f0e9736905c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 2 08:21:42 2021 +0000 Bump NoScript version to 11.2 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4111d63..b5b4470 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -78,9 +78,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 5f68a63637e286433089aeb3b6a0aa930317dd988184876b5d6dcff2ca07bb34 + sha256sum: 4258bcd0bcdfc8ecb231d250e3adf1c477a1a672ede74a5cd10ba05a5381babb - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/maint-10.0-android] Release preparation for 10.0.10
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit d122c0e1324c2d18f41384c816ebcb94fdff9560 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Feb 2 23:18:10 2021 +0000 Release preparation for 10.0.10 Versions bump and Changelog update --- projects/geckoview/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 + projects/tor-browser/allowed_addons.json | 244 ++++++++++----------- rbm.conf | 4 +- 4 files changed, 129 insertions(+), 128 deletions(-) diff --git a/projects/geckoview/config b/projects/geckoview/config index 475385b..45fadb4 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build3' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 935c1a6..c9e8c52 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 10.0.10 -- February 3 2021 + * Android + * Update NoScript to 11.2 + * Update HTTPS Everywhere to 2021.1.27 + * Pick up fix for Mozilla's bug 1688783 + * Bug 40224: Backport Tor patch for v3 onion services [tor-browser-build] + Tor Browser 10.0.9 -- January 26 2021 * Android * Update Fenix to 85.1.0 diff --git a/projects/tor-browser/allowed_addons.json b/projects/tor-browser/allowed_addons.json index e9e5d9d..e02c552 100644 --- a/projects/tor-browser/allowed_addons.json +++ b/projects/tor-browser/allowed_addons.json @@ -17,7 +17,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?mo…" } ], - "average_daily_users": 566381, + "average_daily_users": 579224, "categories": { "android": [ "experimental", @@ -237,10 +237,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5614, - "bayesian_average": 4.5597207572687815, - "count": 3258, - "text_count": 1077 + "average": 4.5587, + "bayesian_average": 4.557036138092991, + "count": 3295, + "text_count": 1090 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/darkreader/reviews/", "requires_payment": false, @@ -336,7 +336,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/darkreader/", - "weekly_downloads": 25282 + "weekly_downloads": 26977 }, "notes": null }, @@ -352,7 +352,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 739840, + "average_daily_users": 745104, "categories": { "firefox": [ "privacy-security" @@ -361,7 +361,7 @@ "contributions_url": "https://www.paypal.me/SupportEFF?utm_content=product-page-contribute&utm_me…", "created": "2010-09-16T15:09:10Z", "current_version": { - "id": 5135114, + "id": 5172099, "compatibility": { "firefox": { "min": "42.0", @@ -372,19 +372,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/https-everywhere/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/https-everywhere/versions…", "files": [ { - "id": 3679479, - "created": "2020-11-16T23:33:04Z", - "hash": "sha256:a6ebcb0a05607e54e7a9fc0b5b3832eda6f13f8dce2ee802164a455919e385c9", + "id": 3716461, + "created": "2021-01-28T01:33:53Z", + "hash": "sha256:da049748bba7282c0f8c0ab85ac8f494e795e79d6bdc6f9f726d687aa8cc2a1f", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1745655, + "size": 1748610, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3679479/https_everywhere-…", + "url": "https://addons.mozilla.org/android/downloads/file/3716461/https_everywhere-…", "permissions": [ "webNavigation", "webRequest", @@ -405,13 +405,13 @@ "name": { "en-US": "Multiple" }, - "url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/license/202…" + "url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/license/202…" }, "release_notes": { - "en-US": "* Copy URL ability in EASE interstitial\n* Dependapot NPM updates\n* CRX distribution scripts for transparency for Edge and Opera\n* Port inclusion on allowlist for EASE\n* UI change to reflect a global setting" + "en-US": "2021.1.27\n* EASE Mode UI Changes\n* NPM Dependency updates\n* Geckodriver pull update\n* Chromedriver pull update\n* Integrate CSS Grid for Options Page and EASE UI\n* Put Options in new tab" }, "reviewed": null, - "version": "2020.11.17" + "version": "2021.1.27" }, "default_locale": "en-US", "description": { @@ -447,7 +447,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2020-11-17T09:09:47Z", + "last_updated": "2021-01-28T11:24:44Z", "name": { "de": "HTTPS Everywhere", "en-US": "HTTPS Everywhere", @@ -482,9 +482,9 @@ "category": "recommended" }, "ratings": { - "average": 4.6133, - "bayesian_average": 4.610763496975475, - "count": 2185, + "average": 4.6136, + "bayesian_average": 4.611070111786746, + "count": 2197, "text_count": 554 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/https-everywhere/reviews/", @@ -518,7 +518,7 @@ ], "type": "extension", "url": "https://www.eff.org/https-everywhere", - "weekly_downloads": 17897 + "weekly_downloads": 18282 }, "notes": null }, @@ -534,7 +534,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/6/6937/6937656.png?modif…" } ], - "average_daily_users": 202121, + "average_daily_users": 204835, "categories": { "android": [ "security-privacy" @@ -747,10 +747,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8002, - "bayesian_average": 4.7954104566041265, - "count": 1211, - "text_count": 306 + "average": 4.801, + "bayesian_average": 4.796215721212788, + "count": 1216, + "text_count": 307 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/decentraleyes/reviews/", "requires_payment": false, @@ -845,7 +845,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/decentraleyes/", - "weekly_downloads": 6066 + "weekly_downloads": 6241 }, "notes": null }, @@ -861,7 +861,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 976267, + "average_daily_users": 990736, "categories": { "android": [ "security-privacy" @@ -873,7 +873,7 @@ "contributions_url": "https://www.paypal.me/SupportEFF?utm_content=product-page-contribute&utm_me…", "created": "2014-05-01T18:23:16Z", "current_version": { - "id": 5147400, + "id": 5175365, "compatibility": { "firefox": { "min": "52.0", @@ -884,19 +884,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/privacy-badger17/versions…", "files": [ { - "id": 3691765, - "created": "2020-12-09T22:01:55Z", - "hash": "sha256:635ded379b5c3259d7bf0997689215bcb0f1bbb77f9289f33b0c01b0cddc7ff0", + "id": 3719726, + "created": "2021-02-02T19:07:00Z", + "hash": "sha256:a9ab465df193e474416844d968ed36991e855b2bd9d965624045cd73373651a6", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1277059, + "size": 1237132, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3691765/privacy_badger-20…", + "url": "https://addons.mozilla.org/android/downloads/file/3719726/privacy_badger-20…", "permissions": [ "tabs", "http://*/*", @@ -1332,10 +1332,10 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<ul><li>Added a direct link to widget content to replacements for widgets like YouTube, Vimeo, SoundCloud and Spotify. You can click this link to watch a video (for example) without sharing the page you are on with the video provider. You can also right-click the link to copy the link URL.</li><li>Fixed \"fbclid\" tracking parameter removal on Facebook</li><li>Enabled Google Search link unwrapping on Firefox for Android</li><li>Fixed various site breakages</li><li>Improved translations (Dutch, Esperanto, French, German, Hebrew, Polish, Russian, Swedish, Turkish, Ukrainian)</li></ul>" + "en-US": "<ul><li>Added a dark theme. To see it, enable dark mode in operating system or device preferences.</li><li>Added a section to the Widget Replacement tab on the options page to manage the list of widgets that were set to be always allowed on certain sites</li><li>Disabled network prefetching/preloading to improve privacy</li><li>Added replacements for Dailymotion and <a href=\"https://outgoing.prod.mozaws.net/v1/f586f988c08c7656e54a255a11f28fbc10a9ad0…" rel=\"nofollow\">OK.ru</a> video player widgets</li><li>Fixed various site breakages</li><li>Improved translations (Simplified Chinese, Czech, French, Hebrew)</li></ul>" }, "reviewed": null, - "version": "2020.12.10" + "version": "2021.2.2" }, "default_locale": "en-US", "description": { @@ -1359,7 +1359,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2020-12-14T10:25:28Z", + "last_updated": "2021-02-02T19:18:34Z", "name": { "en-US": "Privacy Badger" }, @@ -1405,10 +1405,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7834, - "bayesian_average": 4.780097856300104, - "count": 1750, - "text_count": 413 + "average": 4.7854, + "bayesian_average": 4.7821169191877395, + "count": 1766, + "text_count": 412 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1427,7 +1427,7 @@ "tags": [], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/privacy-badger17/", - "weekly_downloads": 38261 + "weekly_downloads": 39948 }, "notes": null }, @@ -1443,7 +1443,7 @@ "picture_url": null } ], - "average_daily_users": 4971335, + "average_daily_users": 4986212, "categories": { "android": [ "security-privacy" @@ -1455,30 +1455,30 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5156717, + "id": 5174693, "compatibility": { "firefox": { - "min": "55.0", + "min": "57.0", "max": "*" }, "android": { - "min": "55.0", + "min": "57.0", "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/51…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/51…", "files": [ { - "id": 3701081, - "created": "2020-12-29T13:58:02Z", - "hash": "sha256:5b94fd7f749319a6ff6d83dd20b05b29e733446465aff2ab7669499a3e8fb9cc", + "id": 3719054, + "created": "2021-02-01T14:04:16Z", + "hash": "sha256:5c3a5ef6f5b5475895053238026360020d6793b05541d20032ea9dd1c9cae451", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 2748800, + "size": 2742973, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3701081/ublock_origin-1.3…", + "url": "https://addons.mozilla.org/android/downloads/file/3719054/ublock_origin-1.3…", "permissions": [ "dns", "menus", @@ -1534,10 +1534,10 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/9fa7d3c9ad42a6b694799cc29274f9b7089f1e6…" rel=\"nofollow\">Complete release notes</a>.\n\n<b>Closed as fixed:</b>\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/396d45d7f82e1bf630b3f16ab1f6be4d60ae2d0…" rel=\"nofollow\">Problems with asterisk in the destination of hostname-based rules</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/345396c53b050d1081014dc73d56f95d30eb255…" rel=\"nofollow\">Commits history since 1.32.2</a>." + "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/a24fd1d9a1598d49cdc2cdc6d3ecd4359712543…" rel=\"nofollow\">Complete release notes</a>.\n\n<b>Closed as fixed:</b>\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/0e94bcfacc284b39a3164377711e52b9ded21cd…" rel=\"nofollow\">After downgrading to 1.32.4, uBO is broken</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/88ab9531e629dc0a259dbe61b357b13316fa1a9…" rel=\"nofollow\">Whitelisting a site on Chromium Edge still blocks resources fetched by service worker</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/35c6fcff904629a7392564335b09eb1fe5f661f…" rel=\"nofollow \">Commits history since 1.33.0</a>." }, "reviewed": null, - "version": "1.32.4" + "version": "1.33.2" }, "default_locale": "en-US", "description": { @@ -1627,7 +1627,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-01-22T14:50:11Z", + "last_updated": "2021-02-02T00:55:07Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1772,10 +1772,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7336, - "bayesian_average": 4.733167443332824, - "count": 13208, - "text_count": 4402 + "average": 4.7334, + "bayesian_average": 4.7329687919776795, + "count": 13286, + "text_count": 4421 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1829,7 +1829,7 @@ "tags": [], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/ublock-origin/", - "weekly_downloads": 118274 + "weekly_downloads": 125282 }, "notes": null }, @@ -1845,7 +1845,7 @@ "picture_url": null } ], - "average_daily_users": 55478, + "average_daily_users": 59113, "categories": { "android": [ "photos-media" @@ -1958,10 +1958,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5087, - "bayesian_average": 4.503205611529312, - "count": 979, - "text_count": 369 + "average": 4.5107, + "bayesian_average": 4.505196681975634, + "count": 983, + "text_count": 372 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1986,7 +1986,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/video-background-play-fix/", - "weekly_downloads": 59 + "weekly_downloads": 33 }, "notes": null }, @@ -2002,7 +2002,7 @@ "picture_url": null } ], - "average_daily_users": 95688, + "average_daily_users": 95760, "categories": { "android": [ "experimental", @@ -2141,10 +2141,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4829, - "bayesian_average": 4.46463504208983, - "count": 292, - "text_count": 82 + "average": 4.4864, + "bayesian_average": 4.468197845946811, + "count": 294, + "text_count": 83 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/privacy-possum/reviews/", "requires_payment": false, @@ -2169,7 +2169,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/privacy-possum/", - "weekly_downloads": 1591 + "weekly_downloads": 1592 }, "notes": null }, @@ -2185,7 +2185,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/12/12929/12929064.png?mo…" } ], - "average_daily_users": 161350, + "average_daily_users": 167020, "categories": { "android": [ "photos-media", @@ -2407,10 +2407,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6609, - "bayesian_average": 4.653940298348592, - "count": 805, - "text_count": 168 + "average": 4.6605, + "bayesian_average": 4.653615440940694, + "count": 816, + "text_count": 169 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/search_by_image/reviews/", "requires_payment": false, @@ -2445,7 +2445,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/search_by_image/", - "weekly_downloads": 8564 + "weekly_downloads": 8653 }, "notes": null }, @@ -2468,7 +2468,7 @@ "picture_url": null } ], - "average_daily_users": 32912, + "average_daily_users": 35527, "categories": { "android": [ "other" @@ -2750,10 +2750,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4419, - "bayesian_average": 4.436303974414219, - "count": 946, - "text_count": 254 + "average": 4.4383, + "bayesian_average": 4.432747479528366, + "count": 956, + "text_count": 257 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2772,7 +2772,7 @@ "tags": [], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/google-search-fixer/", - "weekly_downloads": 53 + "weekly_downloads": 59 }, "notes": null }, @@ -2788,7 +2788,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/0/0/143.png?modified=150…" } ], - "average_daily_users": 410215, + "average_daily_users": 408590, "categories": { "android": [ "performance", @@ -2802,7 +2802,7 @@ "contributions_url": "https://www.paypal.me/NoScript?utm_content=product-page-contribute&utm_medi…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5166141, + "id": 5171142, "compatibility": { "firefox": { "min": "59.0", @@ -2813,19 +2813,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5166141", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5171142", "files": [ { - "id": 3710503, - "created": "2021-01-17T22:30:16Z", - "hash": "sha256:5f68a63637e286433089aeb3b6a0aa930317dd988184876b5d6dcff2ca07bb34", + "id": 3715504, + "created": "2021-01-26T20:49:20Z", + "hash": "sha256:4258bcd0bcdfc8ecb231d250e3adf1c477a1a672ede74a5cd10ba05a5381babb", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 600156, + "size": 601909, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3710503/noscript_security…", + "url": "https://addons.mozilla.org/android/downloads/file/3715504/noscript_security…", "permissions": [ "contextMenus", "storage", @@ -2872,10 +2872,10 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.1.9\n============================================================\nx Return null when webgl is not allowed (thanks Matthew \n Finkel for patch)\nx [XSS] Fixed memoization bug resulting in performance \n degradation on some payloads\nx [XSS] Include call stack in debugging log output\nx [XSS] Skip naps when InjectionChecker runs in its own \n worker\nx Shortcut for easier XSS filter testing\nx More lenient filter to add a new entry to per-site \n permissions\nx [L10n] Updated de\nx Replace script-embedded bitmap with css-embedded SVG as \n the placeholder logo\nx Updated TLDs\nx Remove source map reference causing console noise\nx Fix per-site permissions UI glitches when base domain is \n added to existing subdomain (thanks barbaz for reporting)" + "en-US": "v 11.2\n============================================================\nx [XSS] New UI to reveal and selectively remove permanent\n user choices\nx [L10n] Updated de\nx Webgl hook refactored on nscl/content/patchWindow.js and\n made Chromium-compatibile\nx Updated TLDs" }, "reviewed": null, - "version": "11.1.9" + "version": "11.2" }, "default_locale": "en-US", "description": { @@ -2925,7 +2925,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-01-19T08:35:13Z", + "last_updated": "2021-01-27T09:23:29Z", "name": { "de": "NoScript", "el": "NoScript", @@ -3013,10 +3013,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5416, - "bayesian_average": 4.540012526012674, - "count": 3429, - "text_count": 2367 + "average": 4.54, + "bayesian_average": 4.5384115519938115, + "count": 3435, + "text_count": 2370 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/noscript/reviews/", "requires_payment": false, @@ -3072,7 +3072,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/noscript/", - "weekly_downloads": 11292 + "weekly_downloads": 10802 }, "notes": null }, @@ -3088,7 +3088,7 @@ "picture_url": null } ], - "average_daily_users": 127688, + "average_daily_users": 128738, "categories": { "android": [ "performance", @@ -3102,7 +3102,7 @@ "contributions_url": "", "created": "2011-07-15T10:42:41Z", "current_version": { - "id": 5091396, + "id": 5174694, "compatibility": { "firefox": { "min": "42.0", @@ -3113,31 +3113,27 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/youtube-high-definition/v…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/youtube-high-definition/v…", "files": [ { - "id": 3635763, - "created": "2020-09-01T18:13:07Z", - "hash": "sha256:11cf896eb3b50b13e6bd71aee12a08a76b09dbf9af61ce919172ff12bfc6356d", + "id": 3719055, + "created": "2021-02-01T14:06:14Z", + "hash": "sha256:4ec1f8d3a2081b783d166f32b078d561f1a79942c450381a8d8305085cd24394", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 234528, + "size": 234119, "status": "public", - "url": "https://addons.mozilla.org/android/downloads/file/3635763/youtube_high_defi…", + "url": "https://addons.mozilla.org/android/downloads/file/3719055/youtube_high_defi…", "permissions": [ "tabs", "storage", - "management", - "downloads", "cookies", - "contextMenus", "webRequest", "webRequestBlocking", "<all_urls>", - "*://*.youtube.com/*", - "*://*.barisderin.com/*" + "*://*.youtube.com/*" ], "optional_permissions": [] } @@ -3172,11 +3168,9 @@ }, "url": "http://www.gnu.org/licenses/lgpl-3.0.html" }, - "release_notes": { - "en-US": "Minor bug fixes" - }, + "release_notes": null, "reviewed": null, - "version": "80.0.0" + "version": "85.0.0" }, "default_locale": "en-US", "description": { @@ -3198,7 +3192,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2020-09-02T11:04:33Z", + "last_updated": "2021-02-02T09:14:00Z", "name": { "en-US": "YouTube High Definition", "zh-TW": "YouTube High Definition" @@ -3227,10 +3221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.1071, - "bayesian_average": 4.102893844607107, - "count": 1148, - "text_count": 550 + "average": 4.1125, + "bayesian_average": 4.108301527957989, + "count": 1156, + "text_count": 551 }, "ratings_url": "https://addons.mozilla.org/en-US/android/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -3268,7 +3262,7 @@ ], "type": "extension", "url": "https://addons.mozilla.org/en-US/android/addon/youtube-high-definition/", - "weekly_downloads": 1836 + "weekly_downloads": 2048 }, "notes": null } diff --git a/rbm.conf b/rbm.conf index 8fc7ebd..7b65c5f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,8 +24,8 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.9' - torbrowser_build: 'build3' + torbrowser_version: '10.0.10' + torbrowser_build: 'build1' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 40217: Update components for switch to mozilla86-based Fenix
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit a0d503a2a88d1bd49a099272938b085cd1397ef8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 09:26:50 2021 +0000 Bug 40217: Update components for switch to mozilla86-based Fenix This is the GeckoView part. --- projects/cbindgen/config | 6 +++--- projects/geckoview/config | 4 ++-- projects/geckoview/gradle-dependencies-list.txt | 4 ++-- projects/llvm-project/config | 4 ++-- projects/node/config | 4 ++-- projects/rust/config | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/projects/cbindgen/config b/projects/cbindgen/config index f1e3123..a4e9cb7 100644 --- a/projects/cbindgen/config +++ b/projects/cbindgen/config @@ -14,9 +14,9 @@ var: targets: android: var: - cbindgen_version: 0.15.0 - cbindgen_hash: 83b3be9f884697a51f8717af8b5498866a81e62e - cbindgen_vendor_hash: e5b843e9f51d93bc7dafdc11492fe4f5645b7a2c2aba02c473c0a81da28b961c + cbindgen_version: 0.16.0 + cbindgen_hash: a00b4215a907601680f6e9acaf93df1cbafa8ded + cbindgen_vendor_hash: f470dcf6a60374f07786491fb2971e8b96f9b7ff18956eb24c4e2577e55440d6 input_files: - project: container-image diff --git a/projects/geckoview/config b/projects/geckoview/config index df34bfd..3a0b39a 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 85.0 + geckoview_version: 86.0b1 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -25,7 +25,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 5 + gradle_dependencies_version: 6 steps: merge_aars: diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index d9d886a..f429a3a 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -493,5 +493,5 @@ feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://maven fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven.google.com/com/google/android/gms/play-services-tasks/17.0.0/… 7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc | https://maven.google.com/com/google/android/material/material/1.0.0/materia… c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/materia… -33850fe43f064f95068ca0d81cb99fdb6d67af5e07f0626e433b51b9c2683aee | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4… -cf8acbecac4506eff7c2aead2f5f7c4aeb3120a57d6236f55e0e2f750fab1b55 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.0/apilint-0.4… +45ba0016b1cde3b68856888930dcb859d4f603d98051097caf98c04b795006f3 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.1/apilint-0.4… +78837a67f91cef63c005c8c6074cec05d458bd1b7fdcb930b57a0d461571c7b7 | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.1/apilint-0.4… diff --git a/projects/llvm-project/config b/projects/llvm-project/config index cf81743..822f08d 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 11.0.0 -git_hash: 176249bd6732a8044d457092ed932768724a6f06 +version: 11.0.1 +git_hash: 43ff75f2c3feef64f9d73328230d34dac8832a9 git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' diff --git a/projects/node/config b/projects/node/config index 55f8965..87de822 100644 --- a/projects/node/config +++ b/projects/node/config @@ -10,8 +10,8 @@ var: targets: android: var: - node_version: 10.22.1 - node_hash: f47f4725dcae137b26f8e2a7d0ab2c2c7f1f47e4f96834e6a9242f157132255f + node_version: 10.23.1 + node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa input_files: - project: container-image diff --git a/projects/rust/config b/projects/rust/config index 22ffd35..ba820b9 100644 --- a/projects/rust/config +++ b/projects/rust/config @@ -11,8 +11,8 @@ var: targets: android: var: - current_version: 1.48.0 - previous_version: 1.47.0 + current_version: 1.49.0 + previous_version: 1.48.0 arch_deps: - libssl-dev - pkg-config

1 0

[tor-browser-build/master] Bug 40217: Update components for switch to mozilla86-based Fenix
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

commit 78719e3844cc55faed091670e16a9d5705c57866 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jan 30 10:42:57 2021 +0000 Bug 40217: Update components for switch to mozilla86-based Fenix This is the android-components part. We need to add kotlinx-coroutines-core-1.4.2.jar manually, similar to the 1.3.9 version (see: e06e6c1fb637eb3bad86ced029af4184f3bd750d). --- projects/android-components/build | 5 + projects/android-components/config | 4 +- .../gradle-dependencies-list.txt | 130 +++++++++++---------- 3 files changed, 76 insertions(+), 63 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 187750f..6c62a6c 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -26,6 +26,11 @@ EOF cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo + # Put the Kotlin/Native compiler at the right place, see: + # tor-browser-build#40217. + kotlin_dir=/home/rbm/.konan + mkdir $kotlin_dir + find $gradle_repo -type f -name kotlin-native-prebuilt-linux*tar.gz -exec tar -C $kotlin_dir -xaf {} \; tar -C $distdir -xf [% c('input_files_by_name/application-services') %] # XXX: We could be smarter and just copy over the projects that are needed # according to the Gradle dependencies list. diff --git a/projects/android-components/config b/projects/android-components/config index c0e78a1..5e770c5 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 70.0.16 + android_components_version: 72.0.1 torbrowser_branch: 10.5 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 16 + gradle_dependencies_version: 17 # Switch to make it easier to grab all dependencies during a dry-run. # Note: Use the commit before support for new GeckoView interfaces gets added. fetch_gradle_dependencies: 0 diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index 3840e3c..a23995b 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -12,8 +12,12 @@ a179c12db43d9c0300c9db63f4811db496504be5401b951d422b78490ad1e5b4 | https://dl.go c89d23f9804282a47992ff5ca647b784921c16caa669a7e9af34c15f81aa7442 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.… d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692 | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.… 2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe | https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.… +19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… +046011e16cb01b6f14842565661551110ef1b6427483f5d9068493f4c49690f2 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… 149dd8cec3664bef8ffde86c396ba1e2ab156ea68793d29800d008bacbc9c0f8 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resour… +8d7299bca44cb3bdf17f5595766acbf459fc81fee223e8686cc6acd3a42ab5c0 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/… +340d617121f8ef8e02a6680c8f357aa3e542276d0c8a1cdcb6fd98984b2cb7b9 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/… 3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/… 8eb3cbe823b609853b481646e3d2c1aa39dbde53dd269712fd844ffdef2ebb42 | https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/… 4b6f1d459ddd146b4e85ed6d46e86eb8c2639c5de47904e6db4d698721334220 | https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.… @@ -50,6 +54,7 @@ ba6a806bc1a6faf0cbae08397b3f781feca293ff2b5f3aa600b3d2db142e5ab4 | https://dl.go 384d529ad668ada4808de29b29a6348f0007c2841ad79cae9a5a089bd68810f5 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0… 76c7cfbe596fe3c09a6983bf1c89e889299c08ac9a3b52ce5182a088d056647e | https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0… dae46132cdcd46b798425f7cb78fd65890869b6d26101ccdcd43461a4f51754c | https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0… +524b8b88ceb6a74a7e44e6b567a135660f211799904cb218bfee5be1166820b2 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0… 3d1f4e37b77dd92353879a040ab4ce2f706798bcbdf066147491c3642b3f79a6 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0… 1c6b6626f15185d8f4bc7caac759412a1ab6e851ecf7526387d9b9fadcabdb63 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0… 3ea5d60db139d9fbc5c5f7ac06d779fb75dafe71b0931bc9db863231294bc2d5 | https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0… @@ -315,8 +320,6 @@ ffe9295d9eb2ec2d784bb4c3634f6a10175224d2111332fa2735320b52a24b66 | https://dl.go 42cbea3182b8419a56d1dfe6c74073ad7eb604ca635fd6a82cab8895c21ad91e | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… 85ca0babd7fa3aa3454203105a32836615ac44c59c59e2452bb548c873c4ca44 | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… feb4ebb1ddb76dc18ee9e6028205ac226a70d40247fcccaca092303c68f8b59d | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… -65f0cdc6f2d835e979913600b3fe13a66334ee0730bb78f22d930a8dcdd94715 | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… -7eea522d952b9c733c37f0e806ead84af3e3e6f463dc07ec6cd2379d93f6f0eb | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… e8ae5b40512b71e2258bfacd8cd3da398733aa4cde3b32d056093f832b83a6fe | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… 16f62288613923857f616976985fdfdc212bacc898b2b947715ebffd8fdea19b | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… 2e6d1738b73647f3fe7a038b9780b97717b3746eae258009197e36e7bf3112a5 | https://dl.google.com/dl/android/maven2/com/google/android/gms/play-service… @@ -343,6 +346,7 @@ efe2431a01a188d3037d02a08e60900ec7406de626e4bd5b4995f28d409c0ebd | https://dl.go 24bd1b4a8f81aea76ae30054df6343b5c0abc27024a5f6fb9c6ee7d4ffb86533 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measur… d7a2ff3a2fdbd0801f832df3de81dab06d9db7e4a57dfa6d768e7c6e5fa22280 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… 79b705ecf5140d3a2601b44ef058b4588878432eb6fb2f9d65da0551cb0a8e20 | https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messag… +ae54afed3e3f65a2e3170b203679e86c78979c0c53dd0d7d7a38cf4fa8d46ca7 | https://download.jetbrains.com/kotlin/native/builds/releases/1.4.21/linux/k… 07c3d82ca7eaf4722f00b2da807dc7860f6169ae60cfedcf5d40218f90880a46 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.… 940676b124a8eea8ad7576f9be072c82d7dc7fe350ad895a36081f0c93ae99a6 | https://jcenter.bintray.com/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.… f57c6f089beeedb5b73cdaca7167998ce74505ae9a3d9aeacd72e0ebb0fbf4bc | https://jcenter.bintray.com/com/squareup/okhttp3/parent/3.12.1/parent-3.12.… @@ -436,10 +440,10 @@ ea6cb3d94121d03fefd5329072c7b01d891b8bb25c2c303b28dfd6728eeaa72f | https://maven ca3c96c281e314f07170bbfa766693ef0d2e4d865433a9622254088ee7e68363 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/63.0.0/… 93fd44998bfeeab9d7137cb34a50d510876ec8362e988b8a4ddf4e1629a69e71 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… b3836516ae7c9f1ca38ce636e24e3d10b2b421d94e344f14033daa5f20df3168 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/63.0.… -00d82f17fa8f96206281b150429d2d2efb361b7e16df06f9f93ba3d73c6077a0 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/85.0.… -12043feefa0e0af50d0459835121a2647f63bd8a6766ebda170821dcac99d0e6 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/85.0.… -0bfaeb53dcf5df0a6b816a1950d8b1bd615317a472103b27b61a6a411d853055 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/86… -fd7c6e0136dfbe5357da4bdc749a55d8bb36abd5a9ffeb1fe4497784f373c242 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/86… +6ca800559b22d4bd0833444d3e666390a103307375d000565ea89d571ca1fe81 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/86.0.… +12028814b487c385870e3eb1b40d3cb3027ebbe50af7c3ef182880d6ba79aae9 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/86.0.… +5fe022d90f552aae72e0f7f908ade55798ea5a44bdb6c9458dd7706ba60d4eb6 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/87… +a530ccd2c9adfc3b98e3246c33997831ccbe0d66752e968fb90cfa933006cc99 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/87… 7ac371cfa60025020c391b59890db48c9db52fb67c1b2fd1eda70a2d20b72cb6 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/85.0.20210… e514f95723d5f97c1e92e425923d13add24fdb85c2f761b20ae42d23e0457c0d | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/85.0.20210… 97a9d151ad636acc68eeda046866f0ac24e6f7bf2a81a6b938a3386cc73be529 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… @@ -509,8 +513,11 @@ feab9191311c3d7aeef2b66d6064afc80d3d1d52d980fb07ae43c78c987ba93a | https://repo. 766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7 | https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.2/… 19889dbdf1b254b2601a5ee645b8147a974644882297684c798afe5d63d78dfe | https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.2/… 0f1d8369b1e9f1bc4b467c8dcfdd8b59733aad5b5c8419c3a59b2f9abaf04cd2 | https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.0… +3736463859ec19267295e894940ae82a8f684413031122fe35ce7cff7e30a774 | https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.8.6… c6221763bd79c4f1c3dc7f750b5f29a0bb38b367b81314c4f71896e340c40825 | https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.0/gson-2… a5331a0ecb548f9942ab5b93c7ac43c38a21e897763dde1bcdbf0774f416ca6f | https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.0/gson-2… +c8fb4839054d280b3033f800d1f5a97de2f028eb8ba2eb458ad287e536f3f25f | https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2… +2174415a647332d30fda04bd1cfc708a3ecc84eaf7517f596188d8244e103911 | https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2… 3aa576b5671d0e26d83d7fdb7186810b5672f00bf8e72184260bcc7c2d7dc07a | https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/… 5b9a11c11183d011de9a9a5490962d78a4d4bfe7579b0c5be4afb18a222e3f41 | https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/… 550a6e46a6dfcdf1d764887b6090cea94f783327e50e5c73754f18facfc70b64 | https://repo.maven.apache.org/maven2/com/google/dagger/dagger/2.24/dagger-2… @@ -816,70 +823,71 @@ fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93 | https://repo. 47b23a79fe336b741b82434c6e049d68165256e405e75c10921fd72fa8a65d8d | https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom 303c422700f79d5d13d528b978c6abd9cd136d78d9f7f6f2556e85a81892f9f1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… 648025c01c56b234a7458cb6048ae8fcfa941f9ea8ebf059090733237b9df9b6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -4c801ff4f5151778762ce2d57080f0cb10a4a94cb76ad24593cca35bff36da48 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… f120750af0c9e0c6024c3c76469fd4638ef898fc5bc2d4c49f2fe17568f47b9e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -55b9627bceee132f70f8124b279f618ececf8d5cb8ac97c9d30f43cc5b9b3871 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -2ae0864b6a2db8f6fea11f56dc1f3d4fdc2d1e328a876b5679e8eace58b38577 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… -0ba48754df3bcc16fafb3e22c40a251d01115359809cf14cf5f98aef15d902e1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… -ecf643b89d16fe2d6ad4a7f12755cdf10076545869229dbce43fa1f2445c21fc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… -23c6aa7925e529f0a982539138c69183c038822be149605e5c704f259c1837aa | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… -08c7d6fdbe362cf36e9ccc5980675265fbea29721c485f197efac630eec413b6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… -c0d023cff6ee64d360a5b6d7da17aa068b63a4a721f6323a855249d6737978e6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… -10b4c56cf26d87089777abaaa798b96924ebd42b2f59f806bb7a677f06d92fce | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… -48380e9de166d82197c8f72e42df19d9981f031ffdbcf1cd246ef6d6deff794d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… -6ac9055b2aeda94eb81993cddcf4fd57c5ab53bab3925ec4c4059426317ae5eb | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… -cc42296727533ff7f5ed103f48142d07f396b1ea81f795defde54eeb1a923a37 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… -753b98532fe9569a024e466c4537df66ee2ecb4128ba1aed6635a03793bbe750 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… -b0ba729c8bd039e1973bab95a88577fbc407baefaef016acecf73c06a504a05e | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… -4ce8827541cdb85bfce5bd493b307da13da3c6c5e470f9f2a07f3e578d54b7c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… -83e2d1333ac57832e10eac230f36800fa7fda46a05b7ff76f694714674260cb9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -226514a326c8224f2ce948b106d8a133e17ab8e114db25a5f3e413c5b70f9ae5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -0f5dff8b67b0ea18f41e4c0547de55b83fc12d777cd0806b80c7c415fc65a78f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -f16817733e7ea24ec8559e5ac5d3c2d2d4fcd9a4073be3052147d7c5689b1778 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -46e4691796cd1410872325bed8919a0cd12e619fd16243f8f439ea2114acec8f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -eef93e0497a587b82d335a299f8a0616be8c19ba82a36f795647409182eb25b5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… -3ab3413ec945f801448360ad97bc6e14fec6d606889ede3c707cc277b4467f45 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… -eef345ac9f76f39a8f0364bfbb335619eb506c4e54e1997be1c58dc624b425d9 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… -142c51b9bed14244abdd6ea4551e645be57c3a03a70b9933822e870c05fa8fac | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… -41357fe0c2608446c7a8f1ceb0259042aa0b94d7d92404d5904024dfb88c075a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… -bda57f354344be674e0a241b4c87248857acb411b9dc8ab65068141016466085 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -428551f2529aae79a6dfc3babae871f628d30f5daee8254a339af01dd71ac1cd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -9741d42f28e4f1d621e421ac2b0a4fb2e5f05b1fd4bfd326545b42de57fda4c1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -3e231d28644bff51f7a2e8cb1b6ef01e943cf9efb29720faa14166f7b448de7a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -7e369d1ba702082d9daa54674004aef7cb2adf5d2872e758a87674f4c3144836 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -4728fe40c3b32661ca66cde848e7bf78be95fd18aa07e8e36421257152d157f7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -6cc266acac8dc49f5956f3f553c8de5fce0d1757c65a86b83c4ef0625a82ab69 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… -04b8a39c6860998bd6446bf69c425e42af8f155a639915353c257233fecc2ff8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +baec7911227eec34845439c38876a2dd18eda7c15ac523655411e20e8f053138 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +ec86adcccbb839d099b8649c5277a6fbe41d2c04b61b4b296584e7af52ae4ad1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +185520116f93f72b033b9c17280f5282c0df424240ad1aee3a5206505f5d6c28 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +c152d433cb80e15b9666f030fc851250024d6dd82916f1d1686b7e503562f4c7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-ex… +a7d247044201f11671c8d3132b5435c0317e9966cc499062b70e969db427a545 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… +99983931bacd18d392d2d7396d972539ed79954becdc3fe0fa4924b3fad14d26 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation… +7b42e023a61436990cfa36f53cc2fd6685db5e76bb46e241428fb8da48b9d23b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… +f5f0e2a2f424149de99c2dbd3d3feb81eb26663c8fc9b566dd63383e3507ac2f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-comm… +62b1dc3b2860c65d0231bc73f79299306a8a043bf3810ce98811271aa6780d02 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… +d4a5e8b55dc46a02e525b8c62072877c12f1b4bc743234f0e8d796236b8bf504 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-e… +86ec85db286befd86dcb7694de77bd36b42e4adc6d842ae74e4396a28afc576a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… +33c2aef1ffd80d944fd9efedeedb3d8b16bfbf78cc6db5c033f631b2ff56cfca | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-r… +3522e62a91296368df4a00a0db658e81538f892961ce4056adf4c382068610f7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… +895a4b9f993b5d5c5273196289270c8ceb842476bd3619cf31db4d6afdc4ab29 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-cli… +5084253d5a2f6b6b04ea0fdbba27f6b19598b30b60a96362e6f8db89a8e70e68 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… +337d899037380f0403c6d3118d03db6f94ac5b81b2dfc092d9296eb04da2765f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-emb… +d0db9f51efa7ccb5eda0599f53eb04cbdd4084554ba5bf80f7ef34c6bd16f7e1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +79e4e0f22ed1330cb9af97ba697139093fd99f74fc4b4e182f7d0a50db7ce487 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +0e9263f227494e68572d312e10753a9986e1d841de19c4846e0d20603cefced8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +83fda4a1de6e0e164b87fc6eac7ab24b5427bcf43d311f1dabb8a6f557c5ea12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +c0592d785b285ea1677066913bd7014044379a4694cd4f86faa537bf211d45d0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +d72cb95f92dcc36cf15261ef5d5647f08fdf974839f6b75c0502f5424150a4c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plu… +7e1ae4f15a7aef746c5b89433f1c5e76b301a635854ef3c6b134b0ca31a36624 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… +58b1dc4a27c380f2a8008fd24d52e5597ec2668d8519d2685abcfae5ad234a70 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.… +77e2c30368145180c79e44934bb5901940ee40b6f5f793199b7780ff09fe0ce8 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… +f98caea7f4e70b0040a1618aee9a18e4eb92b578419169ead64a8dab11392538 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-run… +5f400aaea65781039330a5e9755edd55017f36d201c6e5d28aefd6318548afab | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +5f5a780f7369e6a8301062e809e6719a3a694dd61c8ae3e54256e311007fe51f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +96fbbb2d5931d69af3e0d2f2185b0c66b9519acc2e53204cf63fc865977ec698 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +aad1e02bb96a96a5212c43603a06fe941fb66c883b9481b5ac6a5876ef462627 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +fe2df1608a545654a24c04d994bbfde9b6f5433d4a7b56046d336789630ba388 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +9a71c4afcea9b64cf532ca157c9b52618433e035036cc8941e526456908e1e4c | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +68ff14ea2619ba50e425cc34845154f30f5774b18d88bf610de36367aee07da6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… +38eab8e158766968d32851e5000623b54d975610c24bbb625eb64f7086772b77 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-… 6c91dea17d7dce5f0b550c3de3305767e5fb46247b6d1eb7eca0ca1fe18458de | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… d2e537cd1f7705276242d8cc903a0286b6dc86b41b6e728e967ef719022f2e15 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -4681f2d436a68c7523595d84ed5758e1382f9da0f67c91e6a848690d711274fe | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -63480e72a7d4de742b49a6ff90e45f544ca37f3fe11af8b4839f9cd747515d00 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… -f9566380c08722c780ce33ceee23e98ddf765ca98fabd3e2fabae7975c8d232b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -78f2fe1d48e99c64958930ccdc43fce5939460ecdfc65f302823a021d63c520d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -39b7a9442d7a3865e0f4a732c56c1d5da0e11ffb3bb82a461d32deb0c0ca7673 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… -c2f4d70082dbbfcea68fdfa74289cef32df9e4b5ddf359f006036dff1c5b06d6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +812cf197d9c4c67e1f47f95e2d72a9b600f0d1124560617bfe9850773eccbcff | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… +cd840ab880f838af0eb76e25930392c6bf0aa2a2adb5e2d4b0bb9f717a295ebd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-com… +50de5f7dad6235064ac6c0ff577f095a91b3306c2547d8bc372291587495024a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +3b54ad496e7a7f7ad8ad6e846e5c061911242ef474e030ff602beef7565943d6 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +8ec3db1516948b2d3524e3afbe75cb5ac59e02d98cb6ef586ef57ba63ca8d11f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… +5bd2b4922398bd94d1d94e2dca0401089092b453e724a9e746daacacead735b7 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk… 6ea3d0921b26919b286f05cbdb906266666a36f9a7c096197114f7495708ffbc | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… 785b5b66f1146317d5ed5b18c8e0c10f83cd5c909434c799a4da9823f028cd63 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… ff03e9989faa2d40fa4a9098aaad71e247f27ea4d24b0754da642eb0924bd8c5 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3… 3db67dafc422b9015e33cfdb3a4df9e8a6912de63c4b733197c8c189cdbc6d4a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -01ecb09782c042b931c1839acf21a188340b295d05400afd6e3415d4475b8daa | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -a4b9cfbb4bbda523af1e24d52c775fb9c0f7cb568e48b065d45aeb56e63c2762 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… -254b3aee937206a583fe37e5b0a56b570b18c1ccefd7b47a4f436786d49cb452 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… -910c98c585e3a308e93a1c0a021d38dc5e1e3bce1c4cbf04000e4711371ac81a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… -f2ce17a896296ff0ab726934716b2bd06695198e6ed78274afdb1f9e6f283833 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… -db9a950ba9a190d04611e69b1732221ba7035c2796b7d8b6afa69840711cd0ee | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… -3b6529d1872a2c689b2231cf3e75476badd5c5a430206c2c1967e4deb171e50d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -504b6599eb3a3b4d8b4db267d1628e79f3e58f17fc4f6d44c24cda530b0edf39 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -64c6d2b53e52eb65e26c6b828d848d8ceab30473c3511bbd1c116cf9799bc127 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +f78c5d8c09db985912ab83a1de3c3b53ddf208d7b151f06a72358ea3e137d01b | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… +076c5a29b7a79ba2050b52e12307783d6b18d7701ce5245a3f48d005c51ae2be | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4… +baa182386e8dc9716665812dd87d23bc9e094be9b171616b67c74a78c9b02432 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… +1f22fd66716e91f06ed1c8ef9c8a884d12a578645a3a0e3b11ed0745d301541d | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.… +06ad4eb7eda10efa9b0dd38ed1d0464c50b21678c9cb37fb6619793a1c5b10ec | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… +0eafc36acad248e5d62475c38d65b1193d680ea2206a4c6a68de6fea81e972a0 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/… +58b3ce8be4521230361fe6679b5930e75730164be1c7b900ddca4218072fee85 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +5cfd02a5e7dd9be15835522035d32eca33be0e63085d27f7c918fa495e34f81f | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +3286bd65e41eae735600c0e9a441cb4a0988d0d76647923b9c978c90b0cb7311 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… ad426ec76f52b1dcdf200f55495aea9a2d2796811884e8c4b514645061cf59f3 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… 9e82078f4dafe1cc2e28f308a317912a45c6a88fc83c51db6ba8cb0ea0829ef1 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -6538f458473a42b6e2a92676f00d70d4fa0f6ae824d13c1e31c8051c196d2335 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -51be6791ac5aed9718a58b297c8c9081c9b704dfd72a849c4754a40da55ee236 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -f02d46222e4591a9e16b6bacce5dc6606c33b38912d916daa41d428ef6703020 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -5ae9e4dd4e81c0bfc92b0d760651815792793be9ec4f8a2d308b4aea6adbb23a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -e61e3d3db85385c8c2439a5b87b724205cb8605b24edc89d34d8f84ed401eecd | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… -6d2be12eb2f02729639cbf07a590e1fd354ec5042e9233d29de794055c0845bf | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +4cd24a06b2a253110d8afd250e9eec6c6faafea6463d740824743d637e761f12 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +99319ebdd562d9519dfd15f78fe79bc09c3a28875083eea4577d9584359a2f61 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +29038be2ba5cf1acac17fc0d9746e553cf90315b8042366169ff6d800dadf239 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +52614d618c5cb6a8d5d437e95102d1c45565237e09083cd64031ab7b23303a32 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +2e3091a94b8b822c9b68c4dc92ad6a6b0e39e2245b0fc75862de20f5a7a71e9a | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… +497a7639820ba0758d4e0c1d6f82fdc8a9b6f6c2a28d91fe03c6b0776db4be40 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutin… e49454af130e066a4e1c31255c5fd9a23f31105324f48e98406325b051638908 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata… f928d533d912546b6d97904bab53e983f8fe2cda303af9fa953c1438ccf38470 | https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata… 518080049ba83181914419d11a25d9bc9833a2d729b6a6e7469fa52851356da8 | https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.j…

1 0

[tor-browser-build/master] Bug 40217: Update components for switch to mozilla86-based Fenix
by sysrqb＠torproject.org 02 Feb '21

02 Feb '21

1 0

[Git][tpo/applications/android-components][android-components-72.0.1-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel 02 Feb '21

02 Feb '21

Matthew Finkel pushed to branch android-components-72.0.1-10.5-1 at The Tor Project / Applications / android-components Commits: 1b50c4f0 by Matthew Finkel at 2021-02-01T18:32:22+00:00 Bug 40005: Modify Default toolbar menu - - - - - e503e950 by Alex Catarineu at 2021-02-01T18:32:22+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 0380d00a by Alex Catarineu at 2021-02-01T18:32:22+00:00 Bug 40002: Ensure system download manager is not used - - - - - 87dbdb40 by Alex Catarineu at 2021-02-01T18:32:22+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - f38b3ba7 by Alex Catarineu at 2021-02-01T18:32:22+00:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - a91ee71a by Georg Koppen at 2021-02-01T18:32:22+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - de7966cb by Alex Catarineu at 2021-02-01T18:32:22+00:00 Bug 40015: Port padlock states for .onion services - - - - - 379e7cdf by Alex Catarineu at 2021-02-01T18:32:22+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 1fd31798 by Alex Catarineu at 2021-02-02T05:33:59+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - b1d84835 by Matthew Finkel at 2021-02-02T05:33:59+00:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - 3e7f2b2e by Matthew Finkel at 2021-02-02T05:33:59+00:00 Bug 40023: Stop PrivateNotificationService - - - - - 2727ef7e by Matthew Finkel at 2021-02-02T05:34:29+00:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-build/maint-10.0-desktop] Bump HTTPS Everywhere version to 2021.1.27
by gk＠torproject.org 02 Feb '21

02 Feb '21

commit ce74edfb1a946c7756da293c8c18d387a333036e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 2 08:19:59 2021 +0000 Bump HTTPS Everywhere version to 2021.1.27 --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 255d36f..5ef51dd 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.11.17 +version: 2021.1.27 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.10
by gk＠torproject.org 02 Feb '21

02 Feb '21

commit a65e19bfc11c51c8e768b7e2ad56908cace7307c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Feb 2 10:09:19 2021 +0000 Release preparation for 10.0.10 Versions bump and Changelog update --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ rbm.conf | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4df24ca..7714bfc 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 10.0.10 -- February 3 2021 + * Windows + OS X + Linux + * Update NoScript to 11.2 + * Update HTTPS Everywhere to 2021.1.27 + * Bug 40224: Backport Tor patch for v3 onion services [tor-browser-build] + Tor Browser 10.0.9 -- January 26 2021 * Windows + OS X + Linux * Update Firefox to 78.7.0esr diff --git a/rbm.conf b/rbm.conf index 776ddbe..ba9a51e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0.9' - torbrowser_build: 'build2' + torbrowser_version: '10.0.10' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0.7 - 10.0.8 + - 10.0.9 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0