June 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.12.0esr-12.5-1-build4
by Pier Angelo Vendrame (＠pierov) 21 Jun '23

21 Jun '23

Pier Angelo Vendrame pushed new tag tor-browser-102.12.0esr-12.5-1-build4 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 21 Jun '23

21 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: b1c79245 by hackademix at 2023-06-21T17:21:45+02:00 fixup! Firefox preference overrides. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -48,9 +48,6 @@ pref("security.nocertdb", true); pref("browser.download.useDownloadDir", false); pref("browser.download.manager.addToRecentDocs", false); -// Prevent download stuffing / DOS (tor-browser#41764) -pref("browser.download.enable_spam_prevention", true); - // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b1c7924… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b1c7924… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Firefox preference overrides.
by richard (＠richard) 21 Jun '23

21 Jun '23

richard pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 688d2c9f by Pier Angelo Vendrame at 2023-06-20T18:02:53+02:00 fixup! Firefox preference overrides. Bug 41729: Fix screen readers on Windows - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -503,6 +503,10 @@ pref("corroborator.enabled", false); // stop using .textContent. pref("intl.multilingual.liveReload", false); +// tor-browser#41729: if it is false, web content is not accessible to screen +// readers, at least on Windows. +pref("accessibility.cache.enabled", true); + // Onboarding. pref("browser.onboarding.tourset-version", 5); pref("browser.onboarding.newtour", "welcome,privacy,tor-network-9.0,circuit-display,security,expect-differences,onion-services,learn-more"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/688d2c9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/688d2c9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-13.0-1] fixup! Bug 41600: Add a tor circuit display panel.
by Pier Angelo Vendrame (＠pierov) 20 Jun '23

20 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 18d2ce82 by Henry Wilkes at 2023-06-20T18:13:00+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41851: Keep circuit panel open when requesting a new circuit. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.js Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -194,10 +194,6 @@ var gTorCircuitPanel = { .getElementById("tor-circuit-new-circuit") .addEventListener("command", () => { TorDomainIsolator.newCircuitForBrowser(gBrowser); - // And hide. - // NOTE: focus should return to the toolbar button, which we expect to - // remain visible during reload. - this.hide(); }); // Update the display just before opening. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/18d2ce8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/18d2ce8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.12.0esr-12.5-1] fixup! Bug 41600: Add a tor circuit display panel.
by Pier Angelo Vendrame (＠pierov) 20 Jun '23

20 Jun '23

Pier Angelo Vendrame pushed to branch tor-browser-102.12.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4698c04a by Henry Wilkes at 2023-06-20T16:41:45+01:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41851: Keep circuit panel open when requesting a new circuit. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.js Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -194,10 +194,6 @@ var gTorCircuitPanel = { .getElementById("tor-circuit-new-circuit") .addEventListener("command", () => { torbutton_new_circuit(); - // And hide. - // NOTE: focus should return to the toolbar button, which we expect to - // remain visible during reload. - this.hide(); }); // Update the display just before opening. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4698c04… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4698c04… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.5.0-build1
by richard (＠richard) 20 Jun '23

20 Jun '23

richard pushed new tag tbb-12.5.0-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.5] 2 commits: Removed Webtunnel and Conjure PTs as they are alpha only for now
by richard (＠richard) 20 Jun '23

20 Jun '23

richard pushed to branch maint-12.5 at The Tor Project / Applications / tor-browser-build Commits: 0c364851 by Richard Pospesel at 2023-06-17T02:35:57+00:00 Removed Webtunnel and Conjure PTs as they are alpha only for now - - - - - 2ba665d0 by Richard Pospesel at 2023-06-17T02:35:57+00:00 Bug 40730: Tor Browser 12.5.0 - - - - - 18 changed files: - projects/android-components/config - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix - projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix - projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix - projects/browser/allowed_addons.json - projects/browser/build - projects/geckoview/config - projects/tor-android-service/config - projects/tor-expert-bundle/build - projects/tor-expert-bundle/config - projects/tor-expert-bundle/pt_config.json - − projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch - − projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch - projects/tor-onion-proxy-library/build - projects/tor-onion-proxy-library/config - projects/translation/config - rbm.conf Changes: ===================================== projects/android-components/config ===================================== @@ -14,7 +14,7 @@ container: var: android_components_version: 102.0.14 browser_branch: 12.5-1 - android_components_build: 2 + android_components_build: 3 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 37 gradle_version: 7.0.2 ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,183 @@ +Tor Browser 12.5.0 - June 15 2023 + * All Platforms + * Updated Translations + * Bug 40353: Re-enable rlbox [tor-browser-build] + * Bug 40711: Review and expand the stakeholders we communicate major changes to [tor-browser-build] + * Bug 40810: Add Finnish (fi) language support [tor-browser-build] + * Bug 40817: Add basebrowser-incrementals-nightly makefile target [tor-browser-build] + * Bug 40833: base-browser nightly is using the default channel instead of nightly [tor-browser-build] + * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build] + * Bug 41066: Circuit Isolation should take containers into account [tor-browser] + * Bug 41351: Move the crypto protection patch earlier in the patchset [tor-browser] + * Bug 41428: Check if we can create our own directories for branding [tor-browser] + * Bug 41514: eslint broken since migrating torbutton [tor-browser] + * Bug 41568: Disable LaterRun [tor-browser] + * Bug 41599: about:networking#networkid should be normalized [tor-browser] + * Bug 41624: Disable unused about: pages [tor-browser] + * Bug 41635: Disable the Normandy component at compile time [tor-browser] + * Bug 41636: Disable back webextension.storage.sync after ensuring NoScript settings won't be lost [tor-browser] + * Bug 41647: Turn --enable-base-browser in --with-base-browser-version [tor-browser] + * Bug 41662: Disable about:sync-logs [tor-browser] + * Bug 41671: Turn media.peerconnection.ice.relay_only to true as defense in depth against WebRTC ICE leaks [tor-browser] + * Bug 41689: Remove startup.homepage_override_url from Base Browser [tor-browser] + * Bug 41704: Immediately return on remoteSettings.pollChanges [tor-browser] + * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser] + * Bug 41763: TTP-02-003 WP1: Data URI allows JS execution despite safest security level (Low) [tor-browser] + * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser] + * Bug 41818: Remove YEC 2022 strings [tor-browser] + * Windows + macOS + Linux + * Bug 165: Fix maximization warning x button and preference [mullvad-browser] + * Bug 20497: Improve support for non-portable mode [tor-browser] + * Bug 33298: HTTP onion sites do not give a popup warning when submitting form data to non-onion HTTP sites [tor-browser] + * Bug 40144: about:privatebrowsing Firefox branding [tor-browser] + * Bug 40347: URL bar lock icon says connection is not secure when on "view-source:[...].onion" URLs [tor-browser] + * Bug 40552: New texts for the add a bridge manually modal [tor-browser] + * Bug 40701: Improve security warning when downloading a file [tor-browser] + * Bug 40733: Use the new branding directories [tor-browser-build] + * Bug 40745: Allow customizing MOZ_APP_BASENAME [tor-browser-build] + * Bug 40773: Copy some documentation files only on Tor Browser [tor-browser-build] + * Bug 40781: Move translations to new paths [tor-browser-build] + * Bug 40788: Tor Browser 11.0.4-11.0.6 phoning home [tor-browser] + * Bug 40808: Set update URL for nightly base-browser [tor-browser-build] + * Bug 40811: Make testing the updater easier [tor-browser-build] + * Bug 40958: The number of relays displayed for an onion site can be misleading [tor-browser] + * Bug 41038: Update "Click to Copy" button label in circuit display [tor-browser] + * Bug 41080: Some users are choosing an adjacent country for circumvention settings [tor-browser] + * Bug 41084: Reserve red as a button color for dangerous actions [tor-browser] + * Bug 41085: Refactor the UI to remove all bridges [tor-browser] + * Bug 41093: Users don't understand the purpose of bridge-moji [tor-browser] + * Bug 41109: "New circuit..." button gets cut-off when onion name wraps [tor-browser] + * Bug 41350: Move the implementation of Bug 19273 out of Torbutton [tor-browser] + * Bug 41363: Crypto warning popup is not screen reader accessible [tor-browser] + * Bug 41448: User 'danger' style for primary button in new identity modal [tor-browser] + * Bug 41483: Tor Browser says Firefox timed out, confusing users [tor-browser] + * Bug 41503: Disable restart in case of reboot and restore in case of crash [tor-browser] + * Bug 41521: Improve localization notes [tor-browser] + * Bug 41533: Page Info window for view-source:http://...onion addresses says Connection Not Encrypted [tor-browser] + * Bug 41540: Confusing build-id date in about:preferences in alphas [tor-browser] + * Bug 41562: API-triggered fullscreen after F11 causes letterboxing to crop the page [tor-browser] + * Bug 41577: Disable profile migration [tor-browser] + * Bug 41587: Disable the updater for Base Browser [tor-browser] + * Bug 41595: Disable pagethumbnails capturing [tor-browser] + * Bug 41600: Some users have difficulty finding the circuit display [tor-browser] + * Bug 41607: Update "New Circuit" icon [tor-browser] + * Bug 41608: Improve the UX of the location bar's connection status [tor-browser] + * Bug 41609: Move the disabling of Firefox Home (Activity Stream) to base-browser [tor-browser] + * Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs (no hostname, e.g. RFC3966 tel:) [tor-browser] + * Bug 41617: Improve the UX of the built-in bridges dialog [tor-browser] + * Bug 41618: Update the iconography used in the status strip in connection settings [tor-browser] + * Bug 41623: Update connection assist's iconography [tor-browser] + * Bug 41633: Updating from 12.0.2 to 12.0.3 resets NoScript settings [tor-browser] + * Bug 41657: Remove --enable-tor-browser-data-outside-app-dir [tor-browser] + * Bug 41668: Move part of the updater patches to base browser [tor-browser] + * Bug 41686: Move the 'Bug 11641: Disable remoting by default' commit from base-browser to tor-browser [tor-browser] + * Bug 41695: Port warning on maximized windows without letterboxing from torbutton [tor-browser] + * Bug 41699: Tighten up the tor onion alias regular expression [tor-browser] + * Bug 41701: Reporting an extension does not work [tor-browser] + * Bug 41702: The connection pill needs to be centered vertically [tor-browser] + * Bug 41709: sendCommand should not try to send a command forever [tor-browser] + * Bug 41711: Race condition when opening a new window in New Identity [tor-browser] + * Bug 41718: Add the external filetype warning to about:downloads [tor-browser] + * Bug 41719: Update title and button strings in the new circuit display to sentence case [tor-browser] + * Bug 41725: Stray connectionPane.xhtml patch [tor-browser] + * Bug 41726: Animate the torconnect icon to transition between connected states [tor-browser] + * Bug 41734: Add a 'Connected' flag to indicate which built-in bridge option Tor Browser is currently using [tor-browser] + * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser] + * Bug 41749: Replace the onion-glyph with dedicated icon for onion services [tor-browser] + * Bug 41770: Keyboard navigation broken leaving the toolbar tor circuit button [tor-browser] + * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser] + * Bug 41785: Network monitor in developer tools shows HTTP onion resources as insecure [tor-browser] + * Bug 41792: Drag and Drop protection prevents dragging downloads [tor-browser] + * Bug 41800: Add the external filetype warning to Library / Manage Bookmarks [tor-browser] + * Bug 41801: Fix handleProcessReady in TorSettings.init [tor-browser] + * Bug 41802: Bad regex used to extract transport from bridgeline [tor-browser] + * Bug 41810: Add "Connect" buttons to Request Bridge and Provide Bridge modals [tor-browser] + * Bug 41816: The top navigation in about:torconnect isn't updated correctly [tor-browser] + * Bug 41841: Use the new onion-site.svg icon in the onion-location pill [tor-browser] + * Windows + Linux + * Bug 40714: Ship NoScript in the distribution directory also for Windows and Linux [tor-browser-build] + * Bug 41654: UpdateInfo jumped into Data [tor-browser] + * Windows + * Bug 40772: Check and fix HiDPI issues in the NSIS installer [tor-browser-build] + * Bug 40793: Add some metadata also to the Windows installer [tor-browser-build] + * Bug 40801: Correct the ExecShell for system-wide installs in the NSIS script [tor-browser-build] + * Bug 41459: WebRTC fails to build under mingw [tor-browser] + * Bug 41678: WebRTC build fix patches incorrectly defining pid_t [tor-browser] + * macOS + * Bug 40719: Allow non-universal macOS builds also on base-browser [tor-browser-build] + * Bug 41535: Remove the old, unused and undocumented "-invisible" macOS CLI flag [tor-browser] + * Linux + * Bug 40830: The fontconfig directory is missing in Base Browser [tor-browser-build] + * Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP [tor-browser] + * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser] + * Android + * Bug 41001: Remove remaining security slider code [tor-browser] + * Bug 41185: Hide learn more about sync [tor-browser] + * Bug 41634: Google Play incorrectly detects that libTor.so is built with OpenSSL 1.1.1b [tor-browser] + * Bug 41667: Enable media.peerconnection.ice.obfuscate_host_addresses on Android for defense-in-depth [tor-browser] + * Bug 41677: Remove the --disable-tor-browser-update flag on Android [tor-browser] + * Build System + * All Platforms + * Updated Go to 1.20.5 + * Bug 40673: Avoid building each go module separately [tor-browser-build] + * Bug 40679: Use the latest translations for nightly builds [tor-browser-build] + * Bug 40689: Update Ubuntu version from projects/mmdebstrap-image/config to 22.04.1 [tor-browser-build] + * Bug 40717: Create a script to prepare changelogs [tor-browser-build] + * Bug 40720: Update fetch-changelogs.py scripts to support new Build System label [tor-browser-build] + * Bug 40750: Find why rlbox hurts reproducibility [tor-browser-build] + * Bug 40751: make signtag-* needs to take project name into account [tor-browser-build] + * Bug 40753: We should not copy mar tools when the updater is disabled [tor-browser-build] + * Bug 40760: Add BSD packager contacts to release prep templates [tor-browser-build] + * Bug 40763: Add support for signing multiple browsers in tools/signing/nightly [tor-browser-build] + * Bug 40783: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo to use $projectname prefix directory [tor-browser-build] + * Bug 40784: Fix var_p/nightly_torbrowser_incremental_from after #40737 [tor-browser-build] + * Bug 40794: Include the build-id in firefox-l10n output name [tor-browser-build] + * Bug 40795: Trim down tor-browser-build release prep issue templates [tor-browser-build] + * Bug 40796: Bad UX for the changelogs script when using the issue number [tor-browser-build] + * Bug 40805: Define the version flag for all browsers [tor-browser-build] + * Bug 40807: Add config for signing base-browser nightly in tools/signing/nightly [tor-browser-build] + * Bug 40812: Make var/rezip in projects/firefox/config quiet [tor-browser-build] + * Bug 40818: Enable wasm target for rust compiler [tor-browser-build] + * Bug 40828: Use http://archive.debian.org/debian-archive/ for jessie [tor-browser-build] + * Bug 40837: Rebase mullvad-browser build changes onto main [tor-browser-build] + * Bug 40870: Remove url without browser name from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build] + * Bug 41649: Create rebase and security backport gitlab issue templates [tor-browser] + * Bug 41682: Add base-browser nightly mar signing key [tor-browser] + * Windows + macOS + Linux + * Bug 33953: Provide a way for easily updating Go dependencies of projects [tor-browser-build] + * Bug 40713: Use the new tor-browser l10n branch in Firefox [tor-browser-build] + * Bug 40777: Create a Go bootstrap project [tor-browser-build] + * Bug 40778: Disable all translations with testbuilds in Firefox [tor-browser-build] + * Bug 40788: Remove all languages but en-US for privacy-browser build target [tor-browser-build] + * Bug 40809: Remove --enable-tor-browser-update and --enable-verify-mar from projects/firefox/mozconfig [tor-browser-build] + * Bug 40813: Enable var/updater_enabled for basebrowser nightly [tor-browser-build] + * Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml [tor-browser-build] + * Bug 40826: Correctly set appname_marfile for basebrowser in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel [tor-browser-build] + * Bug 40841: Adapt signing scripts to new signing machines [tor-browser-build] + * Bug 40849: Move Go dependencies to the projects dependent on them, not as a standalone projects [tor-browser-build] + * Bug 40866: Remove `Using ansible to set up a nightly build machine` from README [tor-browser-build] + * Bug 40869: obfs4 is renamed to lyrebird [tor-browser-build] + * Windows + * Bug 29185: NSIS Installer not reproducible when icon has an alpha channel [tor-browser-build] + * Bug 40757: Change projects/browser/windows-installer/torbrowser.nsi to a template file [tor-browser-build] + * Windows + macOS + Linux + * Bug 40732: Review Bundle-Data and try not to ship the default profile in base browser [tor-browser-build] + * Linux + Android + * Bug 40653: Build compiler-rt with runtimes instead of the main LLVM build [tor-browser-build] + * macOS + * Bug 40792: signing scripts missing project name prefix to make rule [tor-browser-build] + * Bug 40798: dmg2mar step also takes care of copying the signed+stabled dmg to the signed directory [tor-browser-build] + * Bug 40806: Update the reference to the macOS mozconfig [tor-browser-build] + * Bug 40824: dmg2mar script using hardcoded project names for paths [tor-browser-build] + * Bug 40847: Build filesystem influences the DMG creation [tor-browser-build] + * Bug 40858: Create script to assist testers self sign Mac builds to allow running on Arm processors [tor-browser-build] + * Bug 41453: Rename mozconfig-macos-x86_64 to mozconfig-macos [tor-browser] + * Android + * Bug 40738: Update Android git hashes templates [tor-browser-build] + * Bug 40874: Add commit information also to GV [tor-browser-build] + * Bug 41684: Android improvements for local dev builds [tor-browser] + Tor Browser 12.5a7 - June 08 2023 * All Platforms * Updated Translations @@ -320,7 +500,7 @@ Tor Browser 12.5a3 - February 16 2023 * Bug 41595: Disable pagethumbnails capturing [tor-browser] * Bug 41606: Move the changes to the hamburger menu out of the Torbutton commit [tor-browser] * Bug 41609: Move the disabling of Firefox Home (Activity Stream) to base-browser [tor-browser] - * Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs (no hostname, e.g. RFC3966 tel:) [tor-browser] + * Bug 41613: Skip Drag & Drop filtering for DNS-safe URLs (no hostname, e.g. RFC3966 tel:) [tor-browser] * Bug 41626: Bridge-emojii tooltips not localized in ES locale [tor-browser] * Bug 41633: Updating from 12.0.2 to 12.0.3 resets NoScript settings [tor-browser] * Windows ===================================== projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix ===================================== @@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser ## snowflake configuration ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client - -## webtunnel configuration -ClientTransportPlugin webtunnel exec ./TorBrowser/Tor/PluggableTransports/webtunnel-client - -## conjure configuration -ClientTransportPlugin conjure exec ./TorBrowser/Tor/PluggableTransports/conjure-client -registerURL https://registration.refraction.network/api ===================================== projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix ===================================== @@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTra ## snowflake configuration ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client - -## webtunnel configuration -ClientTransportPlugin webtunnel exec PluggableTransports/webtunnel-client - -## conjure configuration -ClientTransportPlugin conjure exec PluggableTransports/conjure-client -registerURL https://registration.refraction.network/api ===================================== projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix ===================================== @@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\T ## snowflake configuration ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe - -## webtunnel configuration -ClientTransportPlugin webtunnel exec TorBrowser\Tor\PluggableTransports\webtunnel-client.exe - -## conjure configuration -ClientTransportPlugin conjure exec TorBrowser\Tor\PluggableTransports\conjure-client.exe -registerURL https://registration.refraction.network/api ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 974265, + "average_daily_users": 980657, "categories": { "android": [ "experimental", @@ -221,10 +221,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5603, - "bayesian_average": 4.559134490716616, - "count": 5024, - "text_count": 1583 + "average": 4.5606, + "bayesian_average": 4.559435650064087, + "count": 5034, + "text_count": 1584 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 23662 + "weekly_downloads": 23575 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 254515, + "average_daily_users": 256477, "categories": { "android": [ "security-privacy" @@ -553,9 +553,9 @@ "category": "recommended" }, "ratings": { - "average": 4.8143, - "bayesian_average": 4.80964333371513, - "count": 1341, + "average": 4.8142, + "bayesian_average": 4.8095378952749845, + "count": 1340, "text_count": 238 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3353 + "weekly_downloads": 3518 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1107157, + "average_daily_users": 1114212, "categories": { "android": [ "security-privacy" @@ -1180,10 +1180,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8015, - "bayesian_average": 4.798717494585019, - "count": 2237, - "text_count": 428 + "average": 4.8017, + "bayesian_average": 4.798917135524207, + "count": 2239, + "text_count": 429 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1207,7 +1207,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 16875 + "weekly_downloads": 16504 }, "notes": null }, @@ -1223,7 +1223,7 @@ "picture_url": null } ], - "average_daily_users": 6308349, + "average_daily_users": 6354698, "categories": { "android": [ "security-privacy" @@ -1235,7 +1235,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5558705, + "id": 5577564, "compatibility": { "firefox": { "min": "78.0", @@ -1246,7 +1246,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/55…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1257,22 +1257,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/24794abbbc5c8930eafab3…" rel=\"nofollow\">1.49.2</a>.\n\n<b>Fixes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/812da480d7e6e2fa7d6fd1…" rel=\"nofollow\">Reverse usage of browser.alarms</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/53eab9764901466ecb7c1c…" rel=\"nofollow\">Mind rejected promises from vAPI.storage API</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/58bde6ecd0ff76608c1456…" rel=\"nofollow\">Properly handle promise rejection from webext.storage.local API</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3f0e0640ef4983e8fd2352…" rel=\"nofollow\">Add more checks against unexpected conditions re. assets.json</a></li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/deebdaa7a15172babdad3e…" rel=\"nofollow\">Commits history since last version</a>." + "en-US": "See complete release notes for <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/7fcd41188a6953809f0fad…" rel=\"nofollow\">1.50.0</a>.\n\n<b>Fixes / changes</b>\n\n<ul><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/977347fbc293beb1b00cf4…" rel=\"nofollow\">Add support to remove attributes in <code>xml-prune</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/c9e976bb7ba563f559cb84…" rel=\"nofollow\">Fix/improve <code>href-sanitizer</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/947fbffc69bbc18f1b4f8b…" rel=\"nofollow\">Add <code>evaldata-prune</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/6fabbf1578224a96f4235c…" rel=\"nofollow\">Add support for <code>xhr</code> in <code>xml-prune</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/b9b7ca5319d3556ce0d3ed…" rel=\"nofollow\">Add <code>remove-node-text.js</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/da793e19009995cada9b48…" rel=\"nofollow\">Add <code>trusted-set-constant</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/66f1f4b1da03a7a8715f78…" rel=\"nofollow\">Support injecting scriptlet in MAIN or ISOLATED world</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3fd6afc187b7b8c1500645…" rel=\"nofollow\">Add trusted-source support for privileged scriptlets (and add <code>replace-node-text</code> scriptlet)</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/6e4b972fd0290469b171e1…" rel=\"nofollow\">Add <code>spoof-css</code> scriptlet</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4b36cc246f707b4874b088…" rel=\"nofollow\">Add back AdGuard Tracking Protection</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8b57c0f1ab563a91cacf8b…" rel=\"nofollow\">Expand/harden some scriptlets</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/b09d7802d09b73339452c8…" rel=\"nofollow\">Return string when storage.sync.get() promise fails</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2790102e66a40a639271d7…" rel=\"nofollow\">Do not bail out when <code>content-disposition</code> is <code>inline</code></a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a84de6a39a7b337bb548e9…" rel=\"nofollow\">Fix improperly unselecting imported lists</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a38daad10b996d4d90b5a8…" rel=\"nofollow\">Report injected scriptlets in troubleshooting information</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/38b66ee4efd37b2af4acfc…" rel=\"nofollow\">Fix rendering issue of row-filter icon in popup panel</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/554f8ab9f03ac96103840e…" rel=\"nofollow\">Add \"scriptlet\" filter expression to logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ca5c705729c8d4abd4daa7…" rel=\"nofollow\">Fix hostname-detecting regex</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/73dff2c4f0d68678b7155e…" rel=\"nofollow\">Add support for sublists in \"Filter lists\" pane</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/bb5992c336ad2779412f27…" rel=\"nofollow\">Properly handle converted procedural filters in logger</a></li><li><a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ba761870d0433aa47eda9b…" rel=\"nofollow\">Mind small screen size in asset viewer</a></li><li>...</li></ul>\n<a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/5564d601607fa4079ea0e6…" rel=\"nofollow\">Commits history since last version</a>." }, - "reviewed": "2023-05-03T16:26:03Z", - "version": "1.49.2", + "reviewed": "2023-06-12T17:49:10Z", + "version": "1.50.0", "files": [ { - "id": 4103048, - "created": "2023-04-26T14:37:33Z", - "hash": "sha256:39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d", + "id": 4121906, + "created": "2023-06-07T14:50:07Z", + "hash": "sha256:10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 3383174, + "size": 3504841, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.4…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.5…", "permissions": [ "dns", "menus", @@ -1388,7 +1388,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-06-05T13:00:36Z", + "last_updated": "2023-06-12T17:49:10Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1534,9 +1534,9 @@ }, "ratings": { "average": 4.7814, - "bayesian_average": 4.78100041890513, - "count": 15510, - "text_count": 4029 + "bayesian_average": 4.781000601597927, + "count": 15540, + "text_count": 4042 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1598,7 +1598,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 129841 + "weekly_downloads": 129391 }, "notes": null }, @@ -1614,7 +1614,7 @@ "picture_url": null } ], - "average_daily_users": 168486, + "average_daily_users": 168582, "categories": { "android": [ "photos-media" @@ -1713,10 +1713,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4857, - "bayesian_average": 4.480580193554738, - "count": 1120, - "text_count": 420 + "average": 4.4866, + "bayesian_average": 4.481483186522829, + "count": 1122, + "text_count": 422 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1738,7 +1738,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 364 + "weekly_downloads": 340 }, "notes": null }, @@ -1754,7 +1754,7 @@ "picture_url": null } ], - "average_daily_users": 87680, + "average_daily_users": 88127, "categories": { "android": [ "experimental", @@ -1892,7 +1892,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 1851 + "weekly_downloads": 1678 }, "notes": null }, @@ -1908,7 +1908,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 259528, + "average_daily_users": 260714, "categories": { "android": [ "photos-media", @@ -1922,7 +1922,7 @@ "contributions_url": "https://www.paypal.com/donate?hosted_button_id=GLL4UNSNU6SQN&utm_content=pr…", "created": "2017-06-17T15:23:33Z", "current_version": { - "id": 5490272, + "id": 5574786, "compatibility": { "firefox": { "min": "91.0", @@ -1933,7 +1933,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/…", "is_strict_compatibility_enabled": false, "license": { "id": 6, @@ -1944,22 +1944,22 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "Learn more about this release from the <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/034fc31c913b4c44179589…" rel=\"nofollow\">changelog</a>." + "en-US": "Learn more about this release from the <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d50855f24f77fa6f2614b9…" rel=\"nofollow\">changelog</a>." }, - "reviewed": "2022-11-24T10:36:11Z", - "version": "5.4.2", + "reviewed": "2023-06-13T17:09:40Z", + "version": "5.6.0", "files": [ { - "id": 4034617, - "created": "2022-11-23T22:15:06Z", - "hash": "sha256:327549ce86f8dc27794ece4a065cf673e007eefe716fb188b8c6d28102fca22f", + "id": 4119128, + "created": "2023-06-01T20:36:45Z", + "hash": "sha256:fb347a4756e87858fb7ad1e8cb44d3cc4374440d1abdb0fcb3d048c6d5b9c522", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 806112, + "size": 1183625, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4034617/search_by_image-5…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4119128/search_by_image-5…", "permissions": [ "alarms", "clipboardRead", @@ -2001,7 +2001,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2022-11-24T10:36:11Z", + "last_updated": "2023-06-13T17:09:40Z", "name": { "en-US": "Search by Image" }, @@ -2127,9 +2127,9 @@ "category": "recommended" }, "ratings": { - "average": 4.6515, - "bayesian_average": 4.646797768590084, - "count": 1274, + "average": 4.6502, + "bayesian_average": 4.645509748588421, + "count": 1278, "text_count": 245 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", @@ -2151,7 +2151,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 3778 + "weekly_downloads": 3782 }, "notes": null }, @@ -2174,7 +2174,7 @@ "picture_url": null } ], - "average_daily_users": 111546, + "average_daily_users": 111852, "categories": { "android": [ "other" @@ -2457,10 +2457,10 @@ "category": "recommended" }, "ratings": { - "average": 4.442, - "bayesian_average": 4.437335162834797, - "count": 1215, - "text_count": 322 + "average": 4.4424, + "bayesian_average": 4.4377342397439135, + "count": 1216, + "text_count": 323 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2480,7 +2480,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 24 + "weekly_downloads": 42 }, "notes": null }, @@ -2496,7 +2496,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 306985, + "average_daily_users": 308857, "categories": { "android": [ "performance", @@ -2686,10 +2686,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4057, - "bayesian_average": 4.402993200065393, - "count": 2073, - "text_count": 804 + "average": 4.4035, + "bayesian_average": 4.400795824655386, + "count": 2077, + "text_count": 808 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2733,7 +2733,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7512 + "weekly_downloads": 7459 }, "notes": null }, @@ -2749,7 +2749,7 @@ "picture_url": null } ], - "average_daily_users": 150648, + "average_daily_users": 151067, "categories": { "android": [ "performance", @@ -2864,10 +2864,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9003, - "bayesian_average": 3.8960318617843828, - "count": 1133, - "text_count": 401 + "average": 3.8996, + "bayesian_average": 3.8953447616895223, + "count": 1136, + "text_count": 402 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2886,7 +2886,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1940 + "weekly_downloads": 1631 }, "notes": null } ===================================== projects/browser/build ===================================== @@ -109,11 +109,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b # Move READMEs from tor-expert-bundle to the doc dir mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %] - mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %] - mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %] mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md" - mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md" - mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md" # Move the PTs to where TB expects them mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %] ===================================== projects/geckoview/config ===================================== @@ -13,7 +13,7 @@ container: var: geckoview_version: 102.12.0esr browser_branch: 12.5-1 - browser_build: 2 + browser_build: 3 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/tor-android-service/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22 +git_hash: f324999c1773a8d8c83c50106a2cac30be93aabf git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git git_submodule: 1 container: ===================================== projects/tor-expert-bundle/build ===================================== @@ -11,8 +11,6 @@ mkdir pluggable_transports && cd pluggable_transports tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %] tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %] -tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %] -tar -xkf $rootdir/[% c('input_files_by_name/conjure') %] # copy in bridge lines for each pluggable transport mv $rootdir/bridges_list.obfs4.txt . ===================================== projects/tor-expert-bundle/config ===================================== @@ -18,10 +18,6 @@ input_files: project: lyrebird - name: snowflake project: snowflake - - project: webtunnel - name: webtunnel - - name: conjure - project: conjure - filename: pt_config.json - filename: bridges_list.obfs4.txt - filename: bridges_list.meek-azure.txt ===================================== projects/tor-expert-bundle/pt_config.json ===================================== @@ -2,9 +2,7 @@ "recommendedDefault" : "obfs4", "pluggableTransports" : { "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}", - "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}", - "webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}", - "conjure" : "ClientTransportPlugin conjure exec ${pt_path}conjure-client${pt_extension} -registerURL https://registration.refraction.network/api" + "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}" }, "bridges" : { "meek-azure" : [ ===================================== projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch deleted ===================================== @@ -1,74 +0,0 @@ -From 3a6f835e8089dd15f5cd6487b5cfbdfafe7422f8 Mon Sep 17 00:00:00 2001 -From: Shelikhoo <xiaokangwang(a)outlook.com> -Date: Tue, 14 Feb 2023 16:59:59 +0000 -Subject: [PATCH] add WebTunnel Support - ---- - android/build.gradle | 3 +++ - .../thali/toronionproxy/TorConfigBuilder.java | 19 +++++++++++++++---- - 2 files changed, 18 insertions(+), 4 deletions(-) - -diff --git a/android/build.gradle b/android/build.gradle -index e107e8e..acd92c1 100644 ---- a/android/build.gradle -+++ b/android/build.gradle -@@ -102,6 +102,9 @@ task copyPluggableTransports(type: Copy) { - rename { filename -> - filename.replace 'conjure-client', 'libConjure.so' - } -+ rename { filename -> -+ filename.replace 'webtunnel-client', 'libWebtunnel.so' -+ } - } - - gradle.projectsEvaluated { -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index b87993d..5e6d6c5 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -109,8 +109,8 @@ public final class TorConfigBuilder { - return this; - } - -- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException { -- if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null) { -+ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure, File pluggableTransportWebtunnel) throws IOException { -+ if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null || pluggableTransportWebtunnel == null) { - return this; - } - -@@ -144,7 +144,17 @@ public final class TorConfigBuilder { - .getCanonicalPath()); - } - -- transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath()); -+ if (!pluggableTransportWebtunnel.exists()) { -+ throw new IOException("Webtunnel binary does not exist: " + pluggableTransportWebtunnel -+ .getCanonicalPath()); -+ } -+ -+ if (!pluggableTransportWebtunnel.canExecute()) { -+ throw new IOException("Webtunnel binary is not executable: " + pluggableTransportWebtunnel -+ .getCanonicalPath()); -+ } -+ -+ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath(), pluggableTransportWebtunnel.getCanonicalPath()); - return this; - } - -@@ -511,10 +521,11 @@ public final class TorConfigBuilder { - return transPort(settings.transPort()); - } - -- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) { -+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) { - buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); - buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); - buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n"); -+ buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n'); - return this; - } - --- -2.34.1 - ===================================== projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch deleted ===================================== @@ -1,80 +0,0 @@ -From edf4337158df11da3b6ef6d30050e2441cfeafeb Mon Sep 17 00:00:00 2001 -From: Cecylia Bocovich <cohosh(a)torproject.org> -Date: Thu, 13 Oct 2022 10:20:59 -0400 -Subject: [PATCH] Bug 41361: Add conjure support - ---- - android/build.gradle | 3 +++ - .../thali/toronionproxy/TorConfigBuilder.java | 18 ++++++++++++++---- - 2 files changed, 17 insertions(+), 4 deletions(-) - -diff --git a/android/build.gradle b/android/build.gradle -index 2392731..b1aca0a 100644 ---- a/android/build.gradle -+++ b/android/build.gradle -@@ -96,6 +96,9 @@ task copyPluggableTransports(type: Copy) { - rename { filename -> - filename.replace 'snowflake-client', 'libSnowflake.so' - } -+ rename { filename -> -+ filename.replace 'conjure-client', 'libConjure.so' -+ } - } - - gradle.projectsEvaluated { -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -index cc10783..c7e20c0 100644 ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java -@@ -109,8 +109,8 @@ public final class TorConfigBuilder { - return this; - } - -- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException { -- if (pluggableTransportObfs == null || pluggableTransportSnow == null) { -+ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException { -+ if (pluggableTransportObfs == null || pluggableTransportSnow == null || pluggableTransportConjure == null) { - return this; - } - -@@ -124,6 +124,11 @@ public final class TorConfigBuilder { - .getCanonicalPath()); - } - -+ if (!pluggableTransportConjure.exists()) { -+ throw new IOException("Conjure binary does not exist: " + pluggableTransportConjure -+ .getCanonicalPath()); -+ } -+ - if (!pluggableTransportObfs.canExecute()) { - throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs - .getCanonicalPath()); -@@ -134,8 +139,12 @@ public final class TorConfigBuilder { - .getCanonicalPath()); - } - -+ if (!pluggableTransportConjure.canExecute()) { -+ throw new IOException("Conjure binary is not executable: " + pluggableTransportConjure -+ .getCanonicalPath()); -+ } - -- transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath()); -+ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath()); - return this; - } - -@@ -502,9 +511,10 @@ public final class TorConfigBuilder { - return transPort(settings.transPort()); - } - -- public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { -+ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) { - buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); - buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.torproject.net.global.prod.fastly.net/ -front cdn.sstatic.net -ice stun:stun.l.google.com:19302,stun:stun.voip.blackberry.com:3478,stun:stun.altar.com.pl:3478,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.sonetel.net:3478,stun:stun.stunprotocol.org:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478\n"); -+ buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n"); - return this; - } - --- -2.37.2 - ===================================== projects/tor-onion-proxy-library/build ===================================== @@ -24,8 +24,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch -patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch -patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%] # Extract tor-expert-bundle @@ -40,20 +38,12 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch cp $ptdir/lyrebird external/pluto/bin/armeabi/obfs4proxy cp $ptdir/snowflake-client external/pluto/bin/armeabi-v7a/ cp $ptdir/snowflake-client external/pluto/bin/armeabi/ - cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/ - cp $ptdir/conjure-client external/pluto/bin/armeabi/ - cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/ - cp $ptdir/webtunnel-client external/pluto/bin/armeabi/ [% ELSIF arch == "aarch64" -%] cp $ptdir/lyrebird external/pluto/bin/arm64-v8a/obfs4proxy cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/ - cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/ - cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/ [% ELSE -%] cp $ptdir/lyrebird external/pluto/bin/[% arch %]/obfs4proxy cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/ - cp $ptdir/conjure-client external/pluto/bin/[% arch %]/ - cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/ [% END -%] [% END -%] ===================================== projects/tor-onion-proxy-library/config ===================================== @@ -40,5 +40,3 @@ input_files: - filename: gradle.patch - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch - filename: 0001-Bug-30318-Add-snowflake-support.patch - - filename: 0001-Bug-41361-Add-conjure-support.patch - - filename: 0001-Bug-40800-Add-WebTunnel-support.patch ===================================== projects/translation/config ===================================== @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 0a429fd14e8ebe9edcdbaac933c86b4bac8fcb19 + git_hash: 142fc4c709c2c5feee837a8aa7aa8ff89f9a38e1 targets: nightly: git_hash: 'base-browser' base-browser-fluent: base-browser-fluent: '[% INCLUDE build %]' - git_hash: c68657f80050975474903f170250e2888c2a1fea + git_hash: 5625681dc2e6320f82a3d4037c81421fc642b85a targets: nightly: git_hash: 'basebrowser-newidentityftl' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 0cd2ac8d14ce4acd8c9781376a9fdcb9c8323b91 + git_hash: b41ec1d4c1e11668191d9e778ad4732c765bccdd targets: nightly: git_hash: 'tor-browser' @@ -26,7 +26,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 1b094bdfaa444d31f06fe7c0261de89ae67083cc + git_hash: 0391f2fee1299923d67a836043a109656457e0e8 targets: nightly: git_hash: 'fenix-torbrowserstringsxml' ===================================== rbm.conf ===================================== @@ -94,12 +94,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '12.5a7' + torbrowser_version: '12.5.0' torbrowser_build: 'build1' torbrowser_incremental_from: - - 12.5a4 - - 12.5a5 - - 12.5a6 + - 12.0.7 + - 12.0.6 + - 12.0.5 updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor] branch release-0.4.7 updated (eeb1f8b0fd -> 16990f8904)
by gitolite role 19 Jun '23

19 Jun '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from eeb1f8b0fd Merge branch 'maint-0.4.7' into release-0.4.7 new 623a55764b Use the new Stem repository on Gitlab new 94f4d0968b Change git.tpo URLs to gitlab.tpo new 16990f8904 Merge branch 'maint-0.4.7' into release-0.4.7 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitlab-ci.yml | 4 ++-- Makefile.am | 6 +++--- doc/HACKING/CircuitPaddingQuickStart.md | 2 +- doc/HACKING/GettingStarted.md | 2 +- doc/HACKING/README.1st.md | 6 +++--- doc/HACKING/WritingTests.md | 2 +- scripts/git/git-push-all.sh | 2 +- scripts/git/git-setup-dirs.sh | 21 ++------------------- src/test/test-network.sh | 3 ++- 9 files changed, 16 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 1

[tor] branch maint-0.4.7 updated (066da91521 -> 94f4d0968b)
by gitolite role 19 Jun '23

19 Jun '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from 066da91521 changes: Add file for MR 714 new 623a55764b Use the new Stem repository on Gitlab new 94f4d0968b Change git.tpo URLs to gitlab.tpo The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitlab-ci.yml | 4 ++-- Makefile.am | 6 +++--- doc/HACKING/CircuitPaddingQuickStart.md | 2 +- doc/HACKING/GettingStarted.md | 2 +- doc/HACKING/README.1st.md | 6 +++--- doc/HACKING/WritingTests.md | 2 +- scripts/git/git-push-all.sh | 2 +- scripts/git/git-setup-dirs.sh | 21 ++------------------- src/test/test-network.sh | 3 ++- 9 files changed, 16 insertions(+), 32 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (7a83aa4f50 -> 3cb6a690be)
by gitolite role 19 Jun '23

19 Jun '23

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 7a83aa4f50 Merge branch 'tor-gitlab/mr/722' new 623a55764b Use the new Stem repository on Gitlab new 94f4d0968b Change git.tpo URLs to gitlab.tpo new 3cb6a690be Merge branch 'maint-0.4.7' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitlab-ci.yml | 2 +- Makefile.am | 2 +- doc/HACKING/WritingTests.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3