- tbb-commits - lists.torproject.org

[Git][tpo/applications/fenix][tor-browser-91.1.0-11.0-1] 10 commits: Bug 40002: Add GitLab CI
by boklm (＠boklm) 10 Aug '21

10 Aug '21

boklm pushed to branch tor-browser-91.1.0-11.0-1 at The Tor Project / Applications / fenix Commits: 38363fba by Matthew Finkel at 2021-08-09T19:11:02+00:00 Bug 40002: Add GitLab CI Pin CI builds to runners with 32GB of RAM to avoid OOM conditions. - - - - - e3ddcd20 by Matthew Finkel at 2021-08-09T19:11:04+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 - - - - - 2eac143b by Matthew Finkel at 2021-08-09T19:11:05+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 - - - - - 11438ee5 by Georg Koppen at 2021-08-09T19:11:06+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. Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apk's versionName. - - - - - 99359e91 by Matthew Finkel at 2021-08-09T19:11:09+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 Bug 40179: Show Snowflake bridge option on Release Bug 40176: Re-render Home fragment on resume - - - - - ec7d8997 by Alex Catarineu at 2021-08-09T19:11:35+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 40144: Hide Download Manager Bug 40141: Hide EME site permission Bug 40166: Hide "Normal" tab (again) and Sync tab in TabTray Bug 40167: Hide "Save to Collection" in menu Bug 40172: Find the Quit button - - - - - 353a7011 by Alex Catarineu at 2021-08-09T19:11:36+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 - - - - - 5a27bf5d by Matthew Finkel at 2021-08-09T19:11:37+00:00 Add Security Level UI Bug 40026: Implement Security Level settings Bug 40026: Integrate Security Level settings - - - - - 11239f73 by HackerNCoder at 2021-08-09T20:37:37+00:00 Bug 40177: Hide Tor icons in settings - - - - - 187677e9 by Matthew Finkel at 2021-08-09T20:37:38+00:00 Bug 40185: Use NimbusDisabled - - - - - 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/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 - app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/bdf9c3ec4b7c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/bdf9c3ec4b7c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-91.0.0b5-11.0-1] squash! Modify UI/UX
by boklm (＠boklm) 10 Aug '21

10 Aug '21

boklm pushed to branch tor-browser-91.0.0b5-11.0-1 at The Tor Project / Applications / fenix Commits: 2ed13c5b by Matthew Finkel at 2021-08-10T02:15:47+00:00 squash! Modify UI/UX Bug 40186: Hide Credit Cards in Settings - - - - - 1 changed file: - app/src/main/res/xml/account_settings_preferences.xml Changes: ===================================== app/src/main/res/xml/account_settings_preferences.xml ===================================== @@ -31,6 +31,7 @@ <CheckBoxPreference android:defaultValue="true" + android:visible="false" android:key="@string/pref_key_sync_credit_cards" android:layout="@layout/checkbox_left_preference" android:title="@string/preferences_sync_credit_cards" /> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/2ed13c5b461c6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/2ed13c5b461c6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/android-components][android-components-91.0.12-11.0-1] 12 commits: Bug 40005: Modify Default toolbar menu
by boklm (＠boklm) 10 Aug '21

10 Aug '21

boklm pushed to branch android-components-91.0.12-11.0-1 at The Tor Project / Applications / android-components Commits: c5c7ee71 by Matthew Finkel at 2021-08-09T20:41:36+00:00 Bug 40005: Modify Default toolbar menu - - - - - 4225880d by Alex Catarineu at 2021-08-09T20:41:38+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`. - - - - - 51bf7362 by Alex Catarineu at 2021-08-09T20:41:39+00:00 Bug 40002: Ensure system download manager is not used - - - - - 0598c534 by Alex Catarineu at 2021-08-09T20:41:42+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. Bug 40062: Update DuckDuckGo onion search plugin - - - - - b6d332a1 by Alex Catarineu at 2021-08-09T20:41:43+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. - - - - - 1d80ff34 by Georg Koppen at 2021-08-09T20:41:44+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 4a6d898f by Alex Catarineu at 2021-08-09T20:41:46+00:00 Bug 40015: Port padlock states for .onion services - - - - - 0bdf2d6f by Alex Catarineu at 2021-08-09T20:41:47+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 4cbc881f by Alex Catarineu at 2021-08-09T20:41:48+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - 801cc97a by Matthew Finkel at 2021-08-09T20:41:50+00:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - 0ad6c6a3 by Matthew Finkel at 2021-08-09T20:41:51+00:00 Bug 40023: Stop PrivateNotificationService - - - - - 2ec2e7e7 by Matthew Finkel at 2021-08-09T20:41:53+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/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/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 - components/feature/search/src/main/assets/search/list.json - + components/feature/search/src/main/assets/searchplugins/ddg-onion.xml - components/feature/search/src/main/assets/searchplugins/ddg.xml - + components/feature/search/src/main/assets/searchplugins/startpage.xml - + components/feature/search/src/main/assets/searchplugins/yahoo.xml - components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.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-spec/master] Update FF78/90 audits
by sysrqb＠torproject.org 09 Aug '21

09 Aug '21

commit 644285778dcfa79b582b7339edfe429aa01d2f91 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Aug 10 02:56:47 2021 +0000 Update FF78/90 audits --- audits/FF78_NETWORK_AUDIT | 2 +- audits/FF90_NETWORK_AUDIT | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/audits/FF78_NETWORK_AUDIT b/audits/FF78_NETWORK_AUDIT index 6626dda..498176c 100644 --- a/audits/FF78_NETWORK_AUDIT +++ b/audits/FF78_NETWORK_AUDIT @@ -1,6 +1,6 @@ Summary of findings: https://gitlab.torproject.org/tpo/applications/fenix/-/issues/34177 -`git diff 8da33f6c34c0ca5b1d7bca58ca86cb5e436333e8 4735a392536150f49518c48aa9510cf313603b92` +`git diff 8da33f6c34c0ca5b1d7bca58ca86cb5e436333e8 b2301d04e91a4eacf230e6ed9b69ad932993b340` and then go over all the changes containing the above mentioned potentially dangerous calls and features. Grep the diff for the following strings and examine surrounding usage. diff --git a/audits/FF90_NETWORK_AUDIT b/audits/FF90_NETWORK_AUDIT index 7a667c1..672ded1 100644 --- a/audits/FF90_NETWORK_AUDIT +++ b/audits/FF90_NETWORK_AUDIT @@ -14,7 +14,7 @@ functions are documented and analyzed in this audit. ============ Firefox General Portion ============= Start: 3862f77749dd50e54c3d9eea32fb59e84d978c96 # FIREFOX_89_0_RELEASE -End: 5e8ffbe1bf6d448cb235cb0a64a56646a6537b22 # FIREFOX_90_0b12_BUILD1 +End: bf8b9c6630fca1b774dbf1573bf14c9315349514 # FIREFOX_90_0_BUILD1 # Nothing of interest (using `code_audit.sh`) @@ -34,7 +34,7 @@ End: dd09c25f14dbf45f1637ed8dca2d1e5ff668479f # v77.0.2 ============ Android Components Portion ============= Start: 5204f4025ce8b60c64f92eb3f60ee644cafd4fc8 # v75.0.22 -End: 536cb9fe133e555109c3f25024148260aace6dab # v90.0.11 +End: 0ab0465c5ca99b9b01a32e4562905fe51a709204 # v90.0.12 # Issue #10162 # - Don't show the contextual menu for blocked urls @@ -55,7 +55,7 @@ End: 536cb9fe133e555109c3f25024148260aace6dab # v90.0.11 ============ Fenix Portion ============= Start: edea181c543ffee077bb3ca52830ba8d320358b2 # v89.1.1 -End: 6d43c622b4515becbf29ba7956ec2fbe1e5bdc31 # v90.0.0-beta.6 +End: aeedb6b53781c6d29fda9034267a4ce8aeed6468 # v90.1.1 # Issue #19693 # - Display a biometric prompt when a credit card is selected to autofill (#19697)

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-91.0.12-11.0-1
by Matthew Finkel (＠sysrqb) 09 Aug '21

09 Aug '21

Matthew Finkel pushed new branch android-components-91.0.12-11.0-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] Pushed new branch tor-browser-91.1.0-11.0-1
by Matthew Finkel (＠sysrqb) 09 Aug '21

09 Aug '21

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

1 0

[tor-browser-build/maint-10.5] Tor Browser 10.5.4 release preparations
by boklm＠torproject.org 05 Aug '21

05 Aug '21

commit 9b3892532ac96593997afbf16ca8642cd84a51a6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 4 18:15:11 2021 +0000 Tor Browser 10.5.4 release preparations Version bumps and Changelog update --- projects/firefox/config | 2 +- projects/go/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++ projects/tor-browser/config | 4 ++-- rbm.conf | 4 ++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index d62d9ab..1837c5c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 78.12.0 + firefox_platform_version: 78.13.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/go/config b/projects/go/config index 8a67ae8..9572cd2 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.15.13 +version: 1.15.14 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -118,7 +118,7 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 99069e7223479cce4553f84f874b9345f6f4045f27cf5089489b546da619a244 + sha256sum: 60a4a5c48d63d0a13eca8849009b624629ff429c8bc5d1a6a8c3c4da9f34e70a - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5eca79f..bc768d0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,14 @@ +Tor Browser 10.5.4 -- August 10 2021 + * Windows + OS X + Linux + * Update Firefox to 78.13.0esr + * Update NoScript to 11.2.11 + * Bug 40041: Remove V2 Deprecation banner on about:tor for desktop [torbutton] + * Bug 40506: Saved Logins not available in 10.5 [tor-browser] + * Bug 40524: Update DuckDuckGo onion site URL in search preferences and onboarding [tor-browser] + * Build System + * Windows + OS X + Linux + * Update Go to 1.15.14 + Tor Browser 10.5.3 -- July 17 2021 * Android * Update HTTPS Everywhere to 2021.7.13 diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1045d90..4091361 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -78,9 +78,9 @@ input_files: enable: '[% ! 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: 830a25dad07327ae220b4740ea834b0abe715e9ef3dabc326bf7fef2c5af1efb + sha256sum: b833e81823986646dbc473ebbee987bd47757fbe79c9d1720150f08ba6ca9ba9 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 5972405..95ec20a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,11 +57,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5.3' + torbrowser_version: '10.5.4' torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0.18 - 10.5 + - 10.5.2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-78.12.0esr-11.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 05 Aug '21

05 Aug '21

commit 769d48202099078c96835de9758d1fdbe04372e7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Aug 5 15:05:56 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f5a747e06001..32c71313e4e1 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f5a747e06001898e80ef2b0676ed264eb20be349 +Subproject commit 32c71313e4e1da24510402b9051543e144a3129b

1 0

[tor-browser/tor-browser-78.13.0esr-10.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 05 Aug '21

05 Aug '21

commit b2cae7891c8f2b9db3fde6fb99c3e6ea7bee447e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Aug 5 15:05:56 2021 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f5a747e06001..32c71313e4e1 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f5a747e06001898e80ef2b0676ed264eb20be349 +Subproject commit 32c71313e4e1da24510402b9051543e144a3129b

1 0

[torbutton/master] Revert "Bug 40037: Announce v2 onion service deprecation on about:tor"
by sysrqb＠torproject.org 05 Aug '21

05 Aug '21

commit 32c71313e4e1da24510402b9051543e144a3129b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 4 17:55:31 2021 +0000 Revert "Bug 40037: Announce v2 onion service deprecation on about:tor" This reverts commit cc73f75d99e5bd1b610e4a96e89b895ced72407b. Bug 40041: Remove V2 Deprecation banner on about:tor for desktop --- chrome/content/aboutTor/aboutTor.xhtml | 15 ---------- chrome/skin/aboutTor.css | 49 --------------------------------- chrome/skin/tor-banner-warning-icon.svg | 1 - 3 files changed, 65 deletions(-) diff --git a/chrome/content/aboutTor/aboutTor.xhtml b/chrome/content/aboutTor/aboutTor.xhtml index 7a50ebdf..f3a9032f 100644 --- a/chrome/content/aboutTor/aboutTor.xhtml +++ b/chrome/content/aboutTor/aboutTor.xhtml @@ -65,21 +65,6 @@ </form> </div> - <div id="infoBanner"> - <img id="infoBannerImg" src="resource://torbutton-assets/tor-banner-warning-icon.svg" /> - <div id="infoBannerTextCol"> - <div id="infoBannerDescription"> - Tor is ending its support for version 2 (v2) Onion Services, and - v2 onion sites have since been deprecated. If - you're a <b>site administrator</b>, upgrade to a - v3 onion service immediately. - <a id="infoBannerLink" target="_blank" href="https://support.torproject.org/onionservices/#v2-deprecation"> - Learn more - </a> - </div> - </div> - </div> - <div id="bottom"> <p id="donate" class="moreInfoLink">&aboutTor.donationBanner.freeToUse; <a href="https://donate.torproject.org/">&aboutTor.donationBanner.buttonA; »</a> diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 65cc1d3b..38486241 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -220,55 +220,6 @@ body:not([showmanual]) .showForManual { background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } -#infoBanner { - width: 690px; - padding: 20px 25px 25px; - background: rgba(0, 0, 0, 0.3); - border-radius: 6px; - margin: 35px auto 0px; - display: flex; - flex-direction: row; - align-items: flex-start; - position: static; -} - -@media only screen and (min-width: 900px) { - #infoBanner { - margin: 35px 0px 0px 135px; - } -} - -#infoBannerTextCol { - padding: 8px 0px 0px 15px; - font-size: 15px; - line-height: normal; - color: #FFFFFF; - width: 633px; -} - -#infoBannerHeader { - font-weight: bold; -} - -#infoBannerImg { - width: 32px; - height: 32px; - position: static; - border-radius: 32px; -} - -div.infoBannerDescription, div.infoBannerLink { - padding-top: 10px; -} - -a#infoBannerLink { - text-decoration: underline; -} - -a#infoBannerLink:hover { - text-decoration: none; -} - /* #search-text is the search input field */ #search-text { flex: 1; diff --git a/chrome/skin/tor-banner-warning-icon.svg b/chrome/skin/tor-banner-warning-icon.svg deleted file mode 100644 index 3686aba6..00000000 --- a/chrome/skin/tor-banner-warning-icon.svg +++ /dev/null @@ -1 +0,0 @@ -<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><rect fill="#fdd204" height="32" rx="16" width="32"/><path clip-rule="evenodd" d="m16 25c-4.9708 0-9-4.0295-9-9.0002 0-4.9706 4.0292-8.9998 9-8.9998 4.9705 0 9 4.0292 9 8.9998 0 4.9707-4.0295 9.0002-9 9.0002zm.0185-2.7279v1.091c4.0584-.01 7.3449-3.3024 7.3449-7.3633 0-4.0607-3.2865-7.35293-7.3449-7.36316v1.09101c3.4559.00997 6.2541 2.81395 6.2541 6.27215 0 3.4583-2.7982 6.2623-6.2541 6.2723zm3.527-6.2723c0 1.9519-1.5778 3.5344-3.527 3.5447v1.0907c2.552-.0099 4.618-2.0809 4.618-4.6354 0-2.5543-2.066-4.6253-4.618-4.6353v1.0908c1.9492.0102 3.527 1.5927 3.527 3.5445zm-3.527-1.9081c1.0456.01 1.8906.86 1.8906 1.908 0 1.0484-.845 1.8984-1.8906 1.9084z" fill="#240a3b" fill-rule="evenodd"/></svg> \ No newline at end of file

1 0