| 
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:
Changes:
projects/android-components/config
 
| ... | ... | @@ -14,7 +14,7 @@ container: |  
| 14 | 14 |  var:
 |  
| 15 | 15 |    android_components_version: 102.0.14
 |  
| 16 | 16 |    browser_branch: 12.5-1
 |  
| 17 |  | -  android_components_build: 2
 |  
|  | 17 | +  android_components_build: 3
 |  
| 18 | 18 |    # This should be updated when the list of gradle dependencies is changed.
 |  
| 19 | 19 |    gradle_dependencies_version: 37
 |  
| 20 | 20 |    gradle_version: 7.0.2
 |  projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
 
 
|  | 1 | +Tor Browser 12.5.0 - June 15 2023
 |  
|  | 2 | + * All Platforms
 |  
|  | 3 | +   * Updated Translations
 |  
|  | 4 | +   * Bug 40353: Re-enable rlbox [tor-browser-build]
 |  
|  | 5 | +   * Bug 40711: Review and expand the stakeholders we communicate major changes to [tor-browser-build]
 |  
|  | 6 | +   * Bug 40810: Add Finnish (fi) language support [tor-browser-build]
 |  
|  | 7 | +   * Bug 40817: Add basebrowser-incrementals-nightly makefile target [tor-browser-build]
 |  
|  | 8 | +   * Bug 40833: base-browser nightly is using the default channel instead of nightly [tor-browser-build]
 |  
|  | 9 | +   * Bug 40860: Improve the transition from the old fontconfig file to the new one [tor-browser-build]
 |  
|  | 10 | +   * Bug 41066: Circuit Isolation should take containers into account [tor-browser]
 |  
|  | 11 | +   * Bug 41351: Move the crypto protection patch earlier in the patchset [tor-browser]
 |  
|  | 12 | +   * Bug 41428: Check if we can create our own directories for branding [tor-browser]
 |  
|  | 13 | +   * Bug 41514: eslint broken since migrating torbutton [tor-browser]
 |  
|  | 14 | +   * Bug 41568: Disable LaterRun [tor-browser]
 |  
|  | 15 | +   * Bug 41599: about:networking#networkid should be normalized [tor-browser]
 |  
|  | 16 | +   * Bug 41624: Disable unused about: pages [tor-browser]
 |  
|  | 17 | +   * Bug 41635: Disable the Normandy component at compile time [tor-browser]
 |  
|  | 18 | +   * Bug 41636: Disable back webextension.storage.sync after ensuring NoScript settings won't be lost [tor-browser]
 |  
|  | 19 | +   * Bug 41647: Turn --enable-base-browser in --with-base-browser-version [tor-browser]
 |  
|  | 20 | +   * Bug 41662: Disable about:sync-logs [tor-browser]
 |  
|  | 21 | +   * Bug 41671: Turn media.peerconnection.ice.relay_only to true as defense in depth against WebRTC ICE leaks [tor-browser]
 |  
|  | 22 | +   * Bug 41689: Remove startup.homepage_override_url from Base Browser [tor-browser]
 |  
|  | 23 | +   * Bug 41704: Immediately return on remoteSettings.pollChanges [tor-browser]
 |  
|  | 24 | +   * Bug 41738: Replace the patch to disable live reload with its preference [tor-browser]
 |  
|  | 25 | +   * Bug 41763: TTP-02-003 WP1: Data URI allows JS execution despite safest security level (Low) [tor-browser]
 |  
|  | 26 | +   * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser]
 |  
|  | 27 | +   * Bug 41818: Remove YEC 2022 strings [tor-browser]
 |  
|  | 28 | + * Windows + macOS + Linux
 |  
|  | 29 | +   * Bug 165: Fix maximization warning x button and preference [mullvad-browser]
 |  
|  | 30 | +   * Bug 20497: Improve support for non-portable mode [tor-browser]
 |  
|  | 31 | +   * Bug 33298: HTTP onion sites do not give a popup warning when submitting form data to non-onion HTTP sites [tor-browser]
 |  
|  | 32 | +   * Bug 40144: about:privatebrowsing Firefox branding [tor-browser]
 |  
|  | 33 | +   * Bug 40347: URL bar lock icon says connection is not secure when on "view-source:[...].onion" URLs [tor-browser]
 |  
|  | 34 | +   * Bug 40552: New texts for the add a bridge manually modal [tor-browser]
 |  
|  | 35 | +   * Bug 40701: Improve security warning when downloading a file [tor-browser]
 |  
|  | 36 | +   * Bug 40733: Use the new branding directories [tor-browser-build]
 |  
|  | 37 | +   * Bug 40745: Allow customizing MOZ_APP_BASENAME [tor-browser-build]
 |  
|  | 38 | +   * Bug 40773: Copy some documentation files only on Tor Browser [tor-browser-build]
 |  
|  | 39 | +   * Bug 40781: Move translations to new paths [tor-browser-build]
 |  
|  | 40 | +   * Bug 40788: Tor Browser 11.0.4-11.0.6 phoning home [tor-browser]
 |  
|  | 41 | +   * Bug 40808: Set update URL for nightly base-browser [tor-browser-build]
 |  
|  | 42 | +   * Bug 40811: Make testing the updater easier [tor-browser-build]
 |  
|  | 43 | +   * Bug 40958: The number of relays displayed for an onion site can be misleading [tor-browser]
 |  
|  | 44 | +   * Bug 41038: Update "Click to Copy" button label in circuit display [tor-browser]
 |  
|  | 45 | +   * Bug 41080: Some users are choosing an adjacent country for circumvention settings [tor-browser]
 |  
|  | 46 | +   * Bug 41084: Reserve red as a button color for dangerous actions [tor-browser]
 |  
|  | 47 | +   * Bug 41085: Refactor the UI to remove all bridges [tor-browser]
 |  
|  | 48 | +   * Bug 41093: Users don't understand the purpose of bridge-moji [tor-browser]
 |  
|  | 49 | +   * Bug 41109: "New circuit..." button gets cut-off when onion name wraps [tor-browser]
 |  
|  | 50 | +   * Bug 41350: Move the implementation of Bug 19273 out of Torbutton [tor-browser]
 |  
|  | 51 | +   * Bug 41363: Crypto warning popup is not screen reader accessible [tor-browser]
 |  
|  | 52 | +   * Bug 41448: User 'danger' style for primary button in new identity modal [tor-browser]
 |  
|  | 53 | +   * Bug 41483: Tor Browser says Firefox timed out, confusing users [tor-browser]
 |  
|  | 54 | +   * Bug 41503: Disable restart in case of reboot and restore in case of crash [tor-browser]
 |  
|  | 55 | +   * Bug 41521: Improve localization notes [tor-browser]
 |  
|  | 56 | +   * Bug 41533: Page Info window for view-source:http://...onion addresses says Connection Not Encrypted [tor-browser]
 |  
|  | 57 | +   * Bug 41540: Confusing build-id date in about:preferences in alphas [tor-browser]
 |  
|  | 58 | +   * Bug 41562: API-triggered fullscreen after F11 causes letterboxing to crop the page [tor-browser]
 |  
|  | 59 | +   * Bug 41577: Disable profile migration [tor-browser]
 |  
|  | 60 | +   * Bug 41587: Disable the updater for Base Browser [tor-browser]
 |  
|  | 61 | +   * Bug 41595: Disable pagethumbnails capturing [tor-browser]
 |  
|  | 62 | +   * Bug 41600: Some users have difficulty finding the circuit display [tor-browser]
 |  
|  | 63 | +   * Bug 41607: Update "New Circuit" icon [tor-browser]
 |  
|  | 64 | +   * Bug 41608: Improve the UX of the location bar's connection status [tor-browser]
 |  
|  | 65 | +   * Bug 41609: Move the disabling of Firefox Home (Activity Stream) to base-browser [tor-browser]
 |  
|  | 66 | +   * Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs (no hostname, e.g. RFC3966 tel:) [tor-browser]
 |  
|  | 67 | +   * Bug 41617: Improve the UX of the built-in bridges dialog [tor-browser]
 |  
|  | 68 | +   * Bug 41618: Update the iconography used in the status strip in connection settings [tor-browser]
 |  
|  | 69 | +   * Bug 41623: Update connection assist's iconography [tor-browser]
 |  
|  | 70 | +   * Bug 41633: Updating from 12.0.2 to 12.0.3 resets NoScript settings [tor-browser]
 |  
|  | 71 | +   * Bug 41657: Remove --enable-tor-browser-data-outside-app-dir [tor-browser]
 |  
|  | 72 | +   * Bug 41668: Move part of the updater patches to base browser [tor-browser]
 |  
|  | 73 | +   * Bug 41686: Move the 'Bug 11641: Disable remoting by default' commit from base-browser to tor-browser [tor-browser]
 |  
|  | 74 | +   * Bug 41695: Port warning on maximized windows without letterboxing from torbutton [tor-browser]
 |  
|  | 75 | +   * Bug 41699: Tighten up the tor onion alias regular _expression_ [tor-browser]
 |  
|  | 76 | +   * Bug 41701: Reporting an extension does not work [tor-browser]
 |  
|  | 77 | +   * Bug 41702: The connection pill needs to be centered vertically [tor-browser]
 |  
|  | 78 | +   * Bug 41709: sendCommand should not try to send a command forever [tor-browser]
 |  
|  | 79 | +   * Bug 41711: Race condition when opening a new window in New Identity [tor-browser]
 |  
|  | 80 | +   * Bug 41718: Add the external filetype warning to about:downloads [tor-browser]
 |  
|  | 81 | +   * Bug 41719: Update title and button strings in the new circuit display to sentence case [tor-browser]
 |  
|  | 82 | +   * Bug 41725: Stray connectionPane.xhtml patch [tor-browser]
 |  
|  | 83 | +   * Bug 41726: Animate the torconnect icon to transition between connected states [tor-browser]
 |  
|  | 84 | +   * Bug 41734: Add a 'Connected' flag to indicate which built-in bridge option Tor Browser is currently using [tor-browser]
 |  
|  | 85 | +   * Bug 41736: Customize the default CustomizableUI toolbar using CustomizableUI.jsm [tor-browser]
 |  
|  | 86 | +   * Bug 41749: Replace the onion-glyph with dedicated icon for onion services [tor-browser]
 |  
|  | 87 | +   * Bug 41770: Keyboard navigation broken leaving the toolbar tor circuit button [tor-browser]
 |  
|  | 88 | +   * Bug 41775: Avoid re-defining some macros in nsUpdateDriver.cpp [tor-browser]
 |  
|  | 89 | +   * Bug 41785: Network monitor in developer tools shows HTTP onion resources as insecure [tor-browser]
 |  
|  | 90 | +   * Bug 41792: Drag and Drop protection prevents dragging downloads [tor-browser]
 |  
|  | 91 | +   * Bug 41800: Add the external filetype warning to Library / Manage Bookmarks [tor-browser]
 |  
|  | 92 | +   * Bug 41801: Fix handleProcessReady in TorSettings.init [tor-browser]
 |  
|  | 93 | +   * Bug 41802: Bad regex used to extract transport from bridgeline [tor-browser]
 |  
|  | 94 | +   * Bug 41810: Add "Connect" buttons to Request Bridge and Provide Bridge modals [tor-browser]
 |  
|  | 95 | +   * Bug 41816: The top navigation in about:torconnect isn't updated correctly [tor-browser]
 |  
|  | 96 | +   * Bug 41841: Use the new onion-site.svg icon in the onion-location pill [tor-browser]
 |  
|  | 97 | + * Windows + Linux
 |  
|  | 98 | +   * Bug 40714: Ship NoScript in the distribution directory also for Windows and Linux [tor-browser-build]
 |  
|  | 99 | +   * Bug 41654: UpdateInfo jumped into Data [tor-browser]
 |  
|  | 100 | + * Windows
 |  
|  | 101 | +   * Bug 40772: Check and fix HiDPI issues in the NSIS installer [tor-browser-build]
 |  
|  | 102 | +   * Bug 40793: Add some metadata also to the Windows installer [tor-browser-build]
 |  
|  | 103 | +   * Bug 40801: Correct the ExecShell for system-wide installs in the NSIS script [tor-browser-build]
 |  
|  | 104 | +   * Bug 41459: WebRTC fails to build under mingw [tor-browser]
 |  
|  | 105 | +   * Bug 41678: WebRTC build fix patches incorrectly defining pid_t [tor-browser]
 |  
|  | 106 | + * macOS
 |  
|  | 107 | +   * Bug 40719: Allow non-universal macOS builds also on base-browser [tor-browser-build]
 |  
|  | 108 | +   * Bug 41535: Remove the old, unused and undocumented "-invisible" macOS CLI flag [tor-browser]
 |  
|  | 109 | + * Linux
 |  
|  | 110 | +   * Bug 40830: The fontconfig directory is missing in Base Browser [tor-browser-build]
 |  
|  | 111 | +   * Bug 41163: Many bundled fonts are blocked in Ubuntu/Fedora because of RFP [tor-browser]
 |  
|  | 112 | +   * Bug 41732: implement linux font whitelist as defense-in-depth [tor-browser]
 |  
|  | 113 | + * Android
 |  
|  | 114 | +   * Bug 41001: Remove remaining security slider code [tor-browser]
 |  
|  | 115 | +   * Bug 41185: Hide learn more about sync [tor-browser]
 |  
|  | 116 | +   * Bug 41634: Google Play incorrectly detects that libTor.so is built with OpenSSL 1.1.1b [tor-browser]
 |  
|  | 117 | +   * Bug 41667: Enable media.peerconnection.ice.obfuscate_host_addresses on Android for defense-in-depth [tor-browser]
 |  
|  | 118 | +   * Bug 41677: Remove the --disable-tor-browser-update flag on Android [tor-browser]
 |  
|  | 119 | + * Build System
 |  
|  | 120 | +   * All Platforms
 |  
|  | 121 | +     * Updated Go to 1.20.5
 |  
|  | 122 | +     * Bug 40673: Avoid building each go module separately [tor-browser-build]
 |  
|  | 123 | +     * Bug 40679: Use the latest translations for nightly builds [tor-browser-build]
 |  
|  | 124 | +     * Bug 40689: Update Ubuntu version from projects/mmdebstrap-image/config to 22.04.1 [tor-browser-build]
 |  
|  | 125 | +     * Bug 40717: Create a script to prepare changelogs [tor-browser-build]
 |  
|  | 126 | +     * Bug 40720: Update fetch-changelogs.py scripts to support new Build System label [tor-browser-build]
 |  
|  | 127 | +     * Bug 40750: Find why rlbox hurts reproducibility [tor-browser-build]
 |  
|  | 128 | +     * Bug 40751: make signtag-* needs to take project name into account [tor-browser-build]
 |  
|  | 129 | +     * Bug 40753: We should not copy mar tools when the updater is disabled [tor-browser-build]
 |  
|  | 130 | +     * Bug 40760: Add BSD packager contacts to release prep templates [tor-browser-build]
 |  
|  | 131 | +     * Bug 40763: Add support for signing multiple browsers in tools/signing/nightly [tor-browser-build]
 |  
|  | 132 | +     * Bug 40783: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo to use $projectname prefix directory [tor-browser-build]
 |  
|  | 133 | +     * Bug 40784: Fix var_p/nightly_torbrowser_incremental_from after #40737 [tor-browser-build]
 |  
|  | 134 | +     * Bug 40794: Include the build-id in firefox-l10n output name [tor-browser-build]
 |  
|  | 135 | +     * Bug 40795: Trim down tor-browser-build release prep issue templates [tor-browser-build]
 |  
|  | 136 | +     * Bug 40796: Bad UX for the changelogs script when using the issue number [tor-browser-build]
 |  
|  | 137 | +     * Bug 40805: Define the version flag for all browsers [tor-browser-build]
 |  
|  | 138 | +     * Bug 40807: Add config for signing base-browser nightly in tools/signing/nightly [tor-browser-build]
 |  
|  | 139 | +     * Bug 40812: Make var/rezip in projects/firefox/config quiet [tor-browser-build]
 |  
|  | 140 | +     * Bug 40818: Enable wasm target for rust compiler [tor-browser-build]
 |  
|  | 141 | +     * Bug 40828: Use http://archive.debian.org/debian-archive/ for jessie [tor-browser-build]
 |  
|  | 142 | +     * Bug 40837: Rebase mullvad-browser build changes onto main [tor-browser-build]
 |  
|  | 143 | +     * Bug 40870: Remove url without browser name from tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build]
 |  
|  | 144 | +     * Bug 41649: Create rebase and security backport gitlab issue templates [tor-browser]
 |  
|  | 145 | +     * Bug 41682: Add base-browser nightly mar signing key [tor-browser]
 |  
|  | 146 | +   * Windows + macOS + Linux
 |  
|  | 147 | +     * Bug 33953: Provide a way for easily updating Go dependencies of projects [tor-browser-build]
 |  
|  | 148 | +     * Bug 40713: Use the new tor-browser l10n branch in Firefox [tor-browser-build]
 |  
|  | 149 | +     * Bug 40777: Create a Go bootstrap project [tor-browser-build]
 |  
|  | 150 | +     * Bug 40778: Disable all translations with testbuilds in Firefox [tor-browser-build]
 |  
|  | 151 | +     * Bug 40788: Remove all languages but en-US for privacy-browser build target [tor-browser-build]
 |  
|  | 152 | +     * Bug 40809: Remove --enable-tor-browser-update and --enable-verify-mar from projects/firefox/mozconfig [tor-browser-build]
 |  
|  | 153 | +     * Bug 40813: Enable var/updater_enabled for basebrowser nightly [tor-browser-build]
 |  
|  | 154 | +     * Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml [tor-browser-build]
 |  
|  | 155 | +     * Bug 40826: Correctly set appname_marfile for basebrowser in tools/signing/nightly/update-responses-base-config.yml [tor-browser-build]
 |  
|  | 156 | +     * Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel [tor-browser-build]
 |  
|  | 157 | +     * Bug 40841: Adapt signing scripts to new signing machines [tor-browser-build]
 |  
|  | 158 | +     * Bug 40849: Move Go dependencies to the projects dependent on them, not as a standalone projects [tor-browser-build]
 |  
|  | 159 | +     * Bug 40866: Remove `Using ansible to set up a nightly build machine` from README [tor-browser-build]
 |  
|  | 160 | +     * Bug 40869: obfs4 is renamed to lyrebird [tor-browser-build]
 |  
|  | 161 | +   * Windows
 |  
|  | 162 | +     * Bug 29185: NSIS Installer not reproducible when icon has an alpha channel [tor-browser-build]
 |  
|  | 163 | +     * Bug 40757: Change projects/browser/windows-installer/torbrowser.nsi to a template file [tor-browser-build]
 |  
|  | 164 | +   * Windows + macOS + Linux
 |  
|  | 165 | +     * Bug 40732: Review Bundle-Data and try not to ship the default profile in base browser [tor-browser-build]
 |  
|  | 166 | +   * Linux + Android
 |  
|  | 167 | +     * Bug 40653: Build compiler-rt with runtimes instead of the main LLVM build [tor-browser-build]
 |  
|  | 168 | +   * macOS
 |  
|  | 169 | +     * Bug 40792: signing scripts missing project name prefix to make rule [tor-browser-build]
 |  
|  | 170 | +     * Bug 40798: dmg2mar step also takes care of copying the signed+stabled dmg to the signed directory [tor-browser-build]
 |  
|  | 171 | +     * Bug 40806: Update the reference to the macOS mozconfig [tor-browser-build]
 |  
|  | 172 | +     * Bug 40824: dmg2mar script using hardcoded project names for paths [tor-browser-build]
 |  
|  | 173 | +     * Bug 40847: Build filesystem influences the DMG creation [tor-browser-build]
 |  
|  | 174 | +     * Bug 40858: Create script to assist testers self sign Mac builds to allow running on Arm processors [tor-browser-build]
 |  
|  | 175 | +     * Bug 41453: Rename mozconfig-macos-x86_64 to mozconfig-macos [tor-browser]
 |  
|  | 176 | +   * Android
 |  
|  | 177 | +     * Bug 40738: Update Android git hashes templates [tor-browser-build]
 |  
|  | 178 | +     * Bug 40874: Add commit information also to GV [tor-browser-build]
 |  
|  | 179 | +     * Bug 41684: Android improvements for local dev builds [tor-browser]
 |  
|  | 180 | +
 |  
| 1 | 181 |  Tor Browser 12.5a7 - June 08 2023
 |  
| 2 | 182 |   * All Platforms
 |  
| 3 | 183 |     * Updated Translations
 |  
| ... | ... | @@ -320,7 +500,7 @@ Tor Browser 12.5a3 - February 16 2023 |  
| 320 | 500 |     * Bug 41595: Disable pagethumbnails capturing [tor-browser]
 |  
| 321 | 501 |     * Bug 41606: Move the changes to the hamburger menu out of the Torbutton commit [tor-browser]
 |  
| 322 | 502 |     * Bug 41609: Move the disabling of Firefox Home (Activity Stream) to base-browser [tor-browser]
 |  
| 323 |  | -   * Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs (no hostname, e.g. RFC3966 tel:) [tor-browser]
 |  
|  | 503 | +   * Bug 41613: Skip Drag & Drop filtering for DNS-safe URLs (no hostname, e.g. RFC3966 tel:) [tor-browser]
 |  
| 324 | 504 |     * Bug 41626: Bridge-emojii tooltips not localized in ES locale [tor-browser]
 |  
| 325 | 505 |     * Bug 41633: Updating from 12.0.2 to 12.0.3 resets NoScript settings [tor-browser]
 |  
| 326 | 506 |   * Windows
 |  projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix
 
 
| ... | ... | @@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser |  
| 3 | 3 |  
 |  
| 4 | 4 |  ## snowflake configuration
 |  
| 5 | 5 |  ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client |  
| 6 |  | -
 |  
| 7 |  | -## webtunnel configuration
 |  
| 8 |  | -ClientTransportPlugin webtunnel exec ./TorBrowser/Tor/PluggableTransports/webtunnel-client
 |  
| 9 |  | -
 |  
| 10 |  | -## conjure configuration
 |  
| 11 |  | -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 |  
| 3 | 3 |  
 |  
| 4 | 4 |  ## snowflake configuration
 |  
| 5 | 5 |  ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client |  
| 6 |  | -
 |  
| 7 |  | -## webtunnel configuration
 |  
| 8 |  | -ClientTransportPlugin webtunnel exec PluggableTransports/webtunnel-client
 |  
| 9 |  | -
 |  
| 10 |  | -## conjure configuration
 |  
| 11 |  | -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 |  
| 3 | 3 |  
 |  
| 4 | 4 |  ## snowflake configuration
 |  
| 5 | 5 |  ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe |  
| 6 |  | -
 |  
| 7 |  | -## webtunnel configuration
 |  
| 8 |  | -ClientTransportPlugin webtunnel exec TorBrowser\Tor\PluggableTransports\webtunnel-client.exe
 |  
| 9 |  | -
 |  
| 10 |  | -## conjure configuration
 |  
| 11 |  | -ClientTransportPlugin conjure exec TorBrowser\Tor\PluggableTransports\conjure-client.exe -registerURL https://registration.refraction.network/api |  projects/browser/allowed_addons.json
 
 
| ... | ... | @@ -17,7 +17,7 @@ |  
| 17 | 17 |              "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.png?modified=1565722641"
 |  
| 18 | 18 |            }
 |  
| 19 | 19 |          ],
 |  
| 20 |  | -        "average_daily_users": 974265,
 |  
|  | 20 | +        "average_daily_users": 980657,
 |  
| 21 | 21 |          "categories": {
 |  
| 22 | 22 |            "android": [
 |  
| 23 | 23 |              "experimental",
 |  
| ... | ... | @@ -221,10 +221,10 @@ |  
| 221 | 221 |            "category": "recommended"
 |  
| 222 | 222 |          },
 |  
| 223 | 223 |          "ratings": {
 |  
| 224 |  | -          "average": 4.5603,
 |  
| 225 |  | -          "bayesian_average": 4.559134490716616,
 |  
| 226 |  | -          "count": 5024,
 |  
| 227 |  | -          "text_count": 1583
 |  
|  | 224 | +          "average": 4.5606,
 |  
|  | 225 | +          "bayesian_average": 4.559435650064087,
 |  
|  | 226 | +          "count": 5034,
 |  
|  | 227 | +          "text_count": 1584
 |  
| 228 | 228 |          },
 |  
| 229 | 229 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/",
 |  
| 230 | 230 |          "requires_payment": false,
 |  
| ... | ... | @@ -321,7 +321,7 @@ |  
| 321 | 321 |          "type": "extension",
 |  
| 322 | 322 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/",
 |  
| 323 | 323 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/",
 |  
| 324 |  | -        "weekly_downloads": 23662
 |  
|  | 324 | +        "weekly_downloads": 23575
 |  
| 325 | 325 |        },
 |  
| 326 | 326 |        "notes": null
 |  
| 327 | 327 |      },
 |  
| ... | ... | @@ -337,7 +337,7 @@ |  
| 337 | 337 |              "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?modified=1550343990"
 |  
| 338 | 338 |            }
 |  
| 339 | 339 |          ],
 |  
| 340 |  | -        "average_daily_users": 254515,
 |  
|  | 340 | +        "average_daily_users": 256477,
 |  
| 341 | 341 |          "categories": {
 |  
| 342 | 342 |            "android": [
 |  
| 343 | 343 |              "security-privacy"
 |  
| ... | ... | @@ -553,9 +553,9 @@ |  
| 553 | 553 |            "category": "recommended"
 |  
| 554 | 554 |          },
 |  
| 555 | 555 |          "ratings": {
 |  
| 556 |  | -          "average": 4.8143,
 |  
| 557 |  | -          "bayesian_average": 4.80964333371513,
 |  
| 558 |  | -          "count": 1341,
 |  
|  | 556 | +          "average": 4.8142,
 |  
|  | 557 | +          "bayesian_average": 4.8095378952749845,
 |  
|  | 558 | +          "count": 1340,
 |  
| 559 | 559 |            "text_count": 238
 |  
| 560 | 560 |          },
 |  
| 561 | 561 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/",
 |  
| ... | ... | @@ -641,7 +641,7 @@ |  
| 641 | 641 |          "type": "extension",
 |  
| 642 | 642 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/",
 |  
| 643 | 643 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/",
 |  
| 644 |  | -        "weekly_downloads": 3353
 |  
|  | 644 | +        "weekly_downloads": 3518
 |  
| 645 | 645 |        },
 |  
| 646 | 646 |        "notes": null
 |  
| 647 | 647 |      },
 |  
| ... | ... | @@ -657,7 +657,7 @@ |  
| 657 | 657 |              "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?modified=1469820907"
 |  
| 658 | 658 |            }
 |  
| 659 | 659 |          ],
 |  
| 660 |  | -        "average_daily_users": 1107157,
 |  
|  | 660 | +        "average_daily_users": 1114212,
 |  
| 661 | 661 |          "categories": {
 |  
| 662 | 662 |            "android": [
 |  
| 663 | 663 |              "security-privacy"
 |  
| ... | ... | @@ -1180,10 +1180,10 @@ |  
| 1180 | 1180 |            "category": "recommended"
 |  
| 1181 | 1181 |          },
 |  
| 1182 | 1182 |          "ratings": {
 |  
| 1183 |  | -          "average": 4.8015,
 |  
| 1184 |  | -          "bayesian_average": 4.798717494585019,
 |  
| 1185 |  | -          "count": 2237,
 |  
| 1186 |  | -          "text_count": 428
 |  
|  | 1183 | +          "average": 4.8017,
 |  
|  | 1184 | +          "bayesian_average": 4.798917135524207,
 |  
|  | 1185 | +          "count": 2239,
 |  
|  | 1186 | +          "text_count": 429
 |  
| 1187 | 1187 |          },
 |  
| 1188 | 1188 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/",
 |  
| 1189 | 1189 |          "requires_payment": false,
 |  
| ... | ... | @@ -1207,7 +1207,7 @@ |  
| 1207 | 1207 |          "type": "extension",
 |  
| 1208 | 1208 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/",
 |  
| 1209 | 1209 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/",
 |  
| 1210 |  | -        "weekly_downloads": 16875
 |  
|  | 1210 | +        "weekly_downloads": 16504
 |  
| 1211 | 1211 |        },
 |  
| 1212 | 1212 |        "notes": null
 |  
| 1213 | 1213 |      },
 |  
| ... | ... | @@ -1223,7 +1223,7 @@ |  
| 1223 | 1223 |              "picture_url": null
 |  
| 1224 | 1224 |            }
 |  
| 1225 | 1225 |          ],
 |  
| 1226 |  | -        "average_daily_users": 6308349,
 |  
|  | 1226 | +        "average_daily_users": 6354698,
 |  
| 1227 | 1227 |          "categories": {
 |  
| 1228 | 1228 |            "android": [
 |  
| 1229 | 1229 |              "security-privacy"
 |  
| ... | ... | @@ -1235,7 +1235,7 @@ |  
| 1235 | 1235 |          "contributions_url": "",
 |  
| 1236 | 1236 |          "created": "2015-04-25T07:26:22Z",
 |  
| 1237 | 1237 |          "current_version": {
 |  
| 1238 |  | -          "id": 5558705,
 |  
|  | 1238 | +          "id": 5577564,
 |  
| 1239 | 1239 |            "compatibility": {
 |  
| 1240 | 1240 |              "firefox": {
 |  
| 1241 | 1241 |                "min": "78.0",
 |  
| ... | ... | @@ -1246,7 +1246,7 @@ |  
| 1246 | 1246 |                "max": "*"
 |  
| 1247 | 1247 |              }
 |  
| 1248 | 1248 |            },
 |  
| 1249 |  | -          "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/5558705",
 |  
|  | 1249 | +          "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/5577564",
 |  
| 1250 | 1250 |            "is_strict_compatibility_enabled": false,
 |  
| 1251 | 1251 |            "license": {
 |  
| 1252 | 1252 |              "id": 6,
 |  
| ... | ... | @@ -1257,22 +1257,22 @@ |  
| 1257 | 1257 |              "url": "http://www.gnu.org/licenses/gpl-3.0.html"
 |  
| 1258 | 1258 |            },
 |  
| 1259 | 1259 |            "release_notes": {
 |  
| 1260 |  | -            "en-US": "See complete release notes for <a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/24794abbbc5c8930eafab343afddc39bd9aa42f58522feddae09f56a2836e3d5/https%3A//github.com/gorhill/uBlock/releases/tag/1.49.2\" 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/812da480d7e6e2fa7d6fd10655be4539b211ae42df39fd00d20dc610fc837343/https%3A//github.com/gorhill/uBlock/commit/348f75af7fdb8ede8ea09735e854b35a5162040a\" rel=\"nofollow\">Reverse usage of browser.alarms</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/53eab9764901466ecb7c1caee1f71c1132347b569dbad9e5e2863e6c7967ca36/https%3A//github.com/gorhill/uBlock/commit/98d4d24f9b784294bde0db4dd7a1dbed021f2c83\" rel=\"nofollow\">Mind rejected promises from vAPI.storage API</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/58bde6ecd0ff76608c145612b5f1ba1ad63b3731601fc38b819c22755a1c8d9a/https%3A//github.com/gorhill/uBlock/commit/54cb5e22329aec4883c61af3a27f5d3c7ae9d74d\" rel=\"nofollow\">Properly handle promise rejection from webext.storage.local API</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3f0e0640ef4983e8fd23528ab8cec738685753393752bdf9b18d0253d98a7e3d/https%3A//github.com/gorhill/uBlock/commit/6294829e68b2f6eb2afe133205a36cbc8bb529ed\" 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/deebdaa7a15172babdad3eb8fa58f52ce94e3f9990986160bda4c443ee7ac0b5/https%3A//github.com/gorhill/uBlock/compare/1.49.0...1.49.2\" rel=\"nofollow\">Commits history since last version</a>."
 |  
|  | 1260 | +            "en-US": "See complete release notes for <a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/7fcd41188a6953809f0fadaa64ab2f5e52a71c0a08a7c72ff0c21c15124f198c/https%3A//github.com/gorhill/uBlock/releases/tag/1.50.0\" 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/977347fbc293beb1b00cf4fe2576f1a0286ad08b8839846966d117cc37bf9311/https%3A//github.com/gorhill/uBlock/commit/f8c4b8e52d9e\" 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/c9e976bb7ba563f559cb8406e3a42c73733176d87e2c0ac0a1e19b8a6166895c/https%3A//github.com/gorhill/uBlock/commit/f3b720d532c7\" rel=\"nofollow\">Fix/improve <code>href-sanitizer</code> scriptlet</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/947fbffc69bbc18f1b4f8b5dae383c847b49021286563378ef4f53bcfbd0f63a/https%3A//github.com/gorhill/uBlock/commit/c8de9041917b\" rel=\"nofollow\">Add <code>evaldata-prune</code> scriptlet</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/6fabbf1578224a96f4235c713b0bdfaf77aebce6a9238a0fe5dd3734a5130da9/https%3A//github.com/gorhill/uBlock/commit/d3fae27017a1\" 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/b9b7ca5319d3556ce0d3ed55f8e98ee3f08baad9f8185b1e1f6992e9864176d5/https%3A//github.com/gorhill/uBlock/commit/2bb446797a12\" rel=\"nofollow\">Add <code>remove-node-text.js</code> scriptlet</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/da793e19009995cada9b489d00f9ef983d40389b646c691d1f97f9771d78cccc/https%3A//github.com/gorhill/uBlock/commit/19cdd50a1cd0\" rel=\"nofollow\">Add <code>trusted-set-constant</code> scriptlet</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/66f1f4b1da03a7a8715f788f23bb2d2529602bb2c69d010957bb269940846c15/https%3A//github.com/gorhill/uBlock/commit/1a863a877d1b\" rel=\"nofollow\">Support injecting scriptlet in MAIN or ISOLATED world</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/3fd6afc187b7b8c15006453c8566e16a47e590ce1a29db02702381d785abe0d2/https%3A//github.com/gorhill/uBlock/commit/41876336db48\" 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/6e4b972fd0290469b171e1bc187e40bbab9a773a2e809a724a947499a5c6cb2a/https%3A//github.com/gorhill/uBlock/commit/d40546058478\" rel=\"nofollow\">Add <code>spoof-css</code> scriptlet</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/4b36cc246f707b4874b088fdadf87119db2ba87c68f7b3134cd70a754e261e96/https%3A//github.com/gorhill/uBlock/commit/02dff78eab1c\" rel=\"nofollow\">Add back AdGuard Tracking Protection</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/8b57c0f1ab563a91cacf8b5bab85411f3ddc2d319458f08b632906b3c012c0c8/https%3A//github.com/gorhill/uBlock/commit/2ef2888805db\" rel=\"nofollow\">Expand/harden some scriptlets</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/b09d7802d09b73339452c8846d96b78812ff1d5dfad0dc187956e9a00244ef6a/https%3A//github.com/gorhill/uBlock/commit/d5dec1d3c4f3\" rel=\"nofollow\">Return string when storage.sync.get() promise fails</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/2790102e66a40a639271d728446a76f6b75eb1f9df77afe3d2f43f127aafc86a/https%3A//github.com/gorhill/uBlock/commit/a3a80e3b3f41\" 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/a84de6a39a7b337bb548e9722b3514937916ad924b6571b4a902f6c793823f0a/https%3A//github.com/gorhill/uBlock/commit/1a9a8aae0c89\" rel=\"nofollow\">Fix improperly unselecting imported lists</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/a38daad10b996d4d90b5a8eab26a325f5323f91a3d332bf88378c539fe24d930/https%3A//github.com/gorhill/uBlock/commit/578fc21bd9c6\" rel=\"nofollow\">Report injected scriptlets in troubleshooting information</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/38b66ee4efd37b2af4acfcc8b836331e45931ba9a9cacfce2630bffa26949017/https%3A//github.com/gorhill/uBlock/commit/56092189d1cd\" 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/554f8ab9f03ac96103840ea0f00f57f8772c43f90fdcd99c9b07b3be2671f053/https%3A//github.com/gorhill/uBlock/commit/88fb6b153df0\" rel=\"nofollow\">Add \"scriptlet\" filter _expression_ to logger</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ca5c705729c8d4abd4daa7def37281c4f61e2a0009036886946513242b397fe7/https%3A//github.com/gorhill/uBlock/commit/a6b13e6b9cd4\" rel=\"nofollow\">Fix hostname-detecting regex</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/73dff2c4f0d68678b7155e40798111f95f263ce6bc0986800b739828f42ab735/https%3A//github.com/gorhill/uBlock/commit/84fad1deebe5\" rel=\"nofollow\">Add support for sublists in \"Filter lists\" pane</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/bb5992c336ad2779412f271123e19e1f8583395a4c2dbb4b124f3fd878e94011/https%3A//github.com/gorhill/uBlock/commit/5fd35ffb3c91\" rel=\"nofollow\">Properly handle converted procedural filters in logger</a></li><li><a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/ba761870d0433aa47eda9b590dcfe9a8544841f6e8da739f6c97ac1a151eb540/https%3A//github.com/gorhill/uBlock/commit/c31e087946c3\" 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/5564d601607fa4079ea0e625b245f4d6c880baf481a0423683c8f32fce373eb0/https%3A//github.com/gorhill/uBlock/compare/1.49.2...1.50.0\" rel=\"nofollow\">Commits history since last version</a>."
 |  
| 1261 | 1261 |            },
 |  
| 1262 |  | -          "reviewed": "2023-05-03T16:26:03Z",
 |  
| 1263 |  | -          "version": "1.49.2",
 |  
|  | 1262 | +          "reviewed": "2023-06-12T17:49:10Z",
 |  
|  | 1263 | +          "version": "1.50.0",
 |  
| 1264 | 1264 |            "files": [
 |  
| 1265 | 1265 |              {
 |  
| 1266 |  | -              "id": 4103048,
 |  
| 1267 |  | -              "created": "2023-04-26T14:37:33Z",
 |  
| 1268 |  | -              "hash": "sha256:39266486f720cd31d291d2fdad78625b079782a05517e1936eec7e780bc2a84d",
 |  
|  | 1266 | +              "id": 4121906,
 |  
|  | 1267 | +              "created": "2023-06-07T14:50:07Z",
 |  
|  | 1268 | +              "hash": "sha256:10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3",
 |  
| 1269 | 1269 |                "is_restart_required": false,
 |  
| 1270 | 1270 |                "is_webextension": true,
 |  
| 1271 | 1271 |                "is_mozilla_signed_extension": false,
 |  
| 1272 | 1272 |                "platform": "all",
 |  
| 1273 |  | -              "size": 3383174,
 |  
|  | 1273 | +              "size": 3504841,
 |  
| 1274 | 1274 |                "status": "public",
 |  
| 1275 |  | -              "url": "https://addons.mozilla.org/firefox/downloads/file/4103048/ublock_origin-1.49.2.xpi",
 |  
|  | 1275 | +              "url": "https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.50.0.xpi",
 |  
| 1276 | 1276 |                "permissions": [
 |  
| 1277 | 1277 |                  "dns",
 |  
| 1278 | 1278 |                  "menus",
 |  
| ... | ... | @@ -1388,7 +1388,7 @@ |  
| 1388 | 1388 |          },
 |  
| 1389 | 1389 |          "is_disabled": false,
 |  
| 1390 | 1390 |          "is_experimental": false,
 |  
| 1391 |  | -        "last_updated": "2023-06-05T13:00:36Z",
 |  
|  | 1391 | +        "last_updated": "2023-06-12T17:49:10Z",
 |  
| 1392 | 1392 |          "name": {
 |  
| 1393 | 1393 |            "ar": "uBlock Origin",
 |  
| 1394 | 1394 |            "bg": "uBlock Origin",
 |  
| ... | ... | @@ -1534,9 +1534,9 @@ |  
| 1534 | 1534 |          },
 |  
| 1535 | 1535 |          "ratings": {
 |  
| 1536 | 1536 |            "average": 4.7814,
 |  
| 1537 |  | -          "bayesian_average": 4.78100041890513,
 |  
| 1538 |  | -          "count": 15510,
 |  
| 1539 |  | -          "text_count": 4029
 |  
|  | 1537 | +          "bayesian_average": 4.781000601597927,
 |  
|  | 1538 | +          "count": 15540,
 |  
|  | 1539 | +          "text_count": 4042
 |  
| 1540 | 1540 |          },
 |  
| 1541 | 1541 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/",
 |  
| 1542 | 1542 |          "requires_payment": false,
 |  
| ... | ... | @@ -1598,7 +1598,7 @@ |  
| 1598 | 1598 |          "type": "extension",
 |  
| 1599 | 1599 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/",
 |  
| 1600 | 1600 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/",
 |  
| 1601 |  | -        "weekly_downloads": 129841
 |  
|  | 1601 | +        "weekly_downloads": 129391
 |  
| 1602 | 1602 |        },
 |  
| 1603 | 1603 |        "notes": null
 |  
| 1604 | 1604 |      },
 |  
| ... | ... | @@ -1614,7 +1614,7 @@ |  
| 1614 | 1614 |              "picture_url": null
 |  
| 1615 | 1615 |            }
 |  
| 1616 | 1616 |          ],
 |  
| 1617 |  | -        "average_daily_users": 168486,
 |  
|  | 1617 | +        "average_daily_users": 168582,
 |  
| 1618 | 1618 |          "categories": {
 |  
| 1619 | 1619 |            "android": [
 |  
| 1620 | 1620 |              "photos-media"
 |  
| ... | ... | @@ -1713,10 +1713,10 @@ |  
| 1713 | 1713 |            "category": "recommended"
 |  
| 1714 | 1714 |          },
 |  
| 1715 | 1715 |          "ratings": {
 |  
| 1716 |  | -          "average": 4.4857,
 |  
| 1717 |  | -          "bayesian_average": 4.480580193554738,
 |  
| 1718 |  | -          "count": 1120,
 |  
| 1719 |  | -          "text_count": 420
 |  
|  | 1716 | +          "average": 4.4866,
 |  
|  | 1717 | +          "bayesian_average": 4.481483186522829,
 |  
|  | 1718 | +          "count": 1122,
 |  
|  | 1719 | +          "text_count": 422
 |  
| 1720 | 1720 |          },
 |  
| 1721 | 1721 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/reviews/",
 |  
| 1722 | 1722 |          "requires_payment": false,
 |  
| ... | ... | @@ -1738,7 +1738,7 @@ |  
| 1738 | 1738 |          "type": "extension",
 |  
| 1739 | 1739 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/",
 |  
| 1740 | 1740 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/versions/",
 |  
| 1741 |  | -        "weekly_downloads": 364
 |  
|  | 1741 | +        "weekly_downloads": 340
 |  
| 1742 | 1742 |        },
 |  
| 1743 | 1743 |        "notes": null
 |  
| 1744 | 1744 |      },
 |  
| ... | ... | @@ -1754,7 +1754,7 @@ |  
| 1754 | 1754 |              "picture_url": null
 |  
| 1755 | 1755 |            }
 |  
| 1756 | 1756 |          ],
 |  
| 1757 |  | -        "average_daily_users": 87680,
 |  
|  | 1757 | +        "average_daily_users": 88127,
 |  
| 1758 | 1758 |          "categories": {
 |  
| 1759 | 1759 |            "android": [
 |  
| 1760 | 1760 |              "experimental",
 |  
| ... | ... | @@ -1892,7 +1892,7 @@ |  
| 1892 | 1892 |          "type": "extension",
 |  
| 1893 | 1893 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/",
 |  
| 1894 | 1894 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/",
 |  
| 1895 |  | -        "weekly_downloads": 1851
 |  
|  | 1895 | +        "weekly_downloads": 1678
 |  
| 1896 | 1896 |        },
 |  
| 1897 | 1897 |        "notes": null
 |  
| 1898 | 1898 |      },
 |  
| ... | ... | @@ -1908,7 +1908,7 @@ |  
| 1908 | 1908 |              "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.png?modified=1651263207"
 |  
| 1909 | 1909 |            }
 |  
| 1910 | 1910 |          ],
 |  
| 1911 |  | -        "average_daily_users": 259528,
 |  
|  | 1911 | +        "average_daily_users": 260714,
 |  
| 1912 | 1912 |          "categories": {
 |  
| 1913 | 1913 |            "android": [
 |  
| 1914 | 1914 |              "photos-media",
 |  
| ... | ... | @@ -1922,7 +1922,7 @@ |  
| 1922 | 1922 |          "contributions_url": "https://www.paypal.com/donate?hosted_button_id=GLL4UNSNU6SQN&utm_content=product-page-contribute&utm_medium=referral&utm_source=addons.mozilla.org",
 |  
| 1923 | 1923 |          "created": "2017-06-17T15:23:33Z",
 |  
| 1924 | 1924 |          "current_version": {
 |  
| 1925 |  | -          "id": 5490272,
 |  
|  | 1925 | +          "id": 5574786,
 |  
| 1926 | 1926 |            "compatibility": {
 |  
| 1927 | 1927 |              "firefox": {
 |  
| 1928 | 1928 |                "min": "91.0",
 |  
| ... | ... | @@ -1933,7 +1933,7 @@ |  
| 1933 | 1933 |                "max": "*"
 |  
| 1934 | 1934 |              }
 |  
| 1935 | 1935 |            },
 |  
| 1936 |  | -          "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/5490272",
 |  
|  | 1936 | +          "edit_url": "https://addons.mozilla.org/en-US/developers/addon/search_by_image/versions/5574786",
 |  
| 1937 | 1937 |            "is_strict_compatibility_enabled": false,
 |  
| 1938 | 1938 |            "license": {
 |  
| 1939 | 1939 |              "id": 6,
 |  
| ... | ... | @@ -1944,22 +1944,22 @@ |  
| 1944 | 1944 |              "url": "http://www.gnu.org/licenses/gpl-3.0.html"
 |  
| 1945 | 1945 |            },
 |  
| 1946 | 1946 |            "release_notes": {
 |  
| 1947 |  | -            "en-US": "Learn more about this release from the <a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/034fc31c913b4c441795892fe3d65db9f7edbe64b225782c051d3e956eacba86/https%3A//github.com/dessant/search-by-image/blob/master/CHANGELOG.md\" rel=\"nofollow\">changelog</a>."
 |  
|  | 1947 | +            "en-US": "Learn more about this release from the <a href="">\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/d50855f24f77fa6f2614b934add0a44304bfd2b5df2850f5046f560b080ee6df/https%3A//github.com/dessant/search-by-image/blob/main/CHANGELOG.md\" rel=\"nofollow\">changelog</a>."
 |  
| 1948 | 1948 |            },
 |  
| 1949 |  | -          "reviewed": "2022-11-24T10:36:11Z",
 |  
| 1950 |  | -          "version": "5.4.2",
 |  
|  | 1949 | +          "reviewed": "2023-06-13T17:09:40Z",
 |  
|  | 1950 | +          "version": "5.6.0",
 |  
| 1951 | 1951 |            "files": [
 |  
| 1952 | 1952 |              {
 |  
| 1953 |  | -              "id": 4034617,
 |  
| 1954 |  | -              "created": "2022-11-23T22:15:06Z",
 |  
| 1955 |  | -              "hash": "sha256:327549ce86f8dc27794ece4a065cf673e007eefe716fb188b8c6d28102fca22f",
 |  
|  | 1953 | +              "id": 4119128,
 |  
|  | 1954 | +              "created": "2023-06-01T20:36:45Z",
 |  
|  | 1955 | +              "hash": "sha256:fb347a4756e87858fb7ad1e8cb44d3cc4374440d1abdb0fcb3d048c6d5b9c522",
 |  
| 1956 | 1956 |                "is_restart_required": false,
 |  
| 1957 | 1957 |                "is_webextension": true,
 |  
| 1958 | 1958 |                "is_mozilla_signed_extension": false,
 |  
| 1959 | 1959 |                "platform": "all",
 |  
| 1960 |  | -              "size": 806112,
 |  
|  | 1960 | +              "size": 1183625,
 |  
| 1961 | 1961 |                "status": "public",
 |  
| 1962 |  | -              "url": "https://addons.mozilla.org/firefox/downloads/file/4034617/search_by_image-5.4.2.xpi",
 |  
|  | 1962 | +              "url": "https://addons.mozilla.org/firefox/downloads/file/4119128/search_by_image-5.6.0.xpi",
 |  
| 1963 | 1963 |                "permissions": [
 |  
| 1964 | 1964 |                  "alarms",
 |  
| 1965 | 1965 |                  "clipboardRead",
 |  
| ... | ... | @@ -2001,7 +2001,7 @@ |  
| 2001 | 2001 |          },
 |  
| 2002 | 2002 |          "is_disabled": false,
 |  
| 2003 | 2003 |          "is_experimental": false,
 |  
| 2004 |  | -        "last_updated": "2022-11-24T10:36:11Z",
 |  
|  | 2004 | +        "last_updated": "2023-06-13T17:09:40Z",
 |  
| 2005 | 2005 |          "name": {
 |  
| 2006 | 2006 |            "en-US": "Search by Image"
 |  
| 2007 | 2007 |          },
 |  
| ... | ... | @@ -2127,9 +2127,9 @@ |  
| 2127 | 2127 |            "category": "recommended"
 |  
| 2128 | 2128 |          },
 |  
| 2129 | 2129 |          "ratings": {
 |  
| 2130 |  | -          "average": 4.6515,
 |  
| 2131 |  | -          "bayesian_average": 4.646797768590084,
 |  
| 2132 |  | -          "count": 1274,
 |  
|  | 2130 | +          "average": 4.6502,
 |  
|  | 2131 | +          "bayesian_average": 4.645509748588421,
 |  
|  | 2132 | +          "count": 1278,
 |  
| 2133 | 2133 |            "text_count": 245
 |  
| 2134 | 2134 |          },
 |  
| 2135 | 2135 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/",
 |  
| ... | ... | @@ -2151,7 +2151,7 @@ |  
| 2151 | 2151 |          "type": "extension",
 |  
| 2152 | 2152 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/",
 |  
| 2153 | 2153 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/",
 |  
| 2154 |  | -        "weekly_downloads": 3778
 |  
|  | 2154 | +        "weekly_downloads": 3782
 |  
| 2155 | 2155 |        },
 |  
| 2156 | 2156 |        "notes": null
 |  
| 2157 | 2157 |      },
 |  
| ... | ... | @@ -2174,7 +2174,7 @@ |  
| 2174 | 2174 |              "picture_url": null
 |  
| 2175 | 2175 |            }
 |  
| 2176 | 2176 |          ],
 |  
| 2177 |  | -        "average_daily_users": 111546,
 |  
|  | 2177 | +        "average_daily_users": 111852,
 |  
| 2178 | 2178 |          "categories": {
 |  
| 2179 | 2179 |            "android": [
 |  
| 2180 | 2180 |              "other"
 |  
| ... | ... | @@ -2457,10 +2457,10 @@ |  
| 2457 | 2457 |            "category": "recommended"
 |  
| 2458 | 2458 |          },
 |  
| 2459 | 2459 |          "ratings": {
 |  
| 2460 |  | -          "average": 4.442,
 |  
| 2461 |  | -          "bayesian_average": 4.437335162834797,
 |  
| 2462 |  | -          "count": 1215,
 |  
| 2463 |  | -          "text_count": 322
 |  
|  | 2460 | +          "average": 4.4424,
 |  
|  | 2461 | +          "bayesian_average": 4.4377342397439135,
 |  
|  | 2462 | +          "count": 1216,
 |  
|  | 2463 | +          "text_count": 323
 |  
| 2464 | 2464 |          },
 |  
| 2465 | 2465 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/",
 |  
| 2466 | 2466 |          "requires_payment": false,
 |  
| ... | ... | @@ -2480,7 +2480,7 @@ |  
| 2480 | 2480 |          "type": "extension",
 |  
| 2481 | 2481 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/",
 |  
| 2482 | 2482 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/",
 |  
| 2483 |  | -        "weekly_downloads": 24
 |  
|  | 2483 | +        "weekly_downloads": 42
 |  
| 2484 | 2484 |        },
 |  
| 2485 | 2485 |        "notes": null
 |  
| 2486 | 2486 |      },
 |  
| ... | ... | @@ -2496,7 +2496,7 @@ |  
| 2496 | 2496 |              "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified=1506804587"
 |  
| 2497 | 2497 |            }
 |  
| 2498 | 2498 |          ],
 |  
| 2499 |  | -        "average_daily_users": 306985,
 |  
|  | 2499 | +        "average_daily_users": 308857,
 |  
| 2500 | 2500 |          "categories": {
 |  
| 2501 | 2501 |            "android": [
 |  
| 2502 | 2502 |              "performance",
 |  
| ... | ... | @@ -2686,10 +2686,10 @@ |  
| 2686 | 2686 |            "category": "recommended"
 |  
| 2687 | 2687 |          },
 |  
| 2688 | 2688 |          "ratings": {
 |  
| 2689 |  | -          "average": 4.4057,
 |  
| 2690 |  | -          "bayesian_average": 4.402993200065393,
 |  
| 2691 |  | -          "count": 2073,
 |  
| 2692 |  | -          "text_count": 804
 |  
|  | 2689 | +          "average": 4.4035,
 |  
|  | 2690 | +          "bayesian_average": 4.400795824655386,
 |  
|  | 2691 | +          "count": 2077,
 |  
|  | 2692 | +          "text_count": 808
 |  
| 2693 | 2693 |          },
 |  
| 2694 | 2694 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/",
 |  
| 2695 | 2695 |          "requires_payment": false,
 |  
| ... | ... | @@ -2733,7 +2733,7 @@ |  
| 2733 | 2733 |          "type": "extension",
 |  
| 2734 | 2734 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/",
 |  
| 2735 | 2735 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/",
 |  
| 2736 |  | -        "weekly_downloads": 7512
 |  
|  | 2736 | +        "weekly_downloads": 7459
 |  
| 2737 | 2737 |        },
 |  
| 2738 | 2738 |        "notes": null
 |  
| 2739 | 2739 |      },
 |  
| ... | ... | @@ -2749,7 +2749,7 @@ |  
| 2749 | 2749 |              "picture_url": null
 |  
| 2750 | 2750 |            }
 |  
| 2751 | 2751 |          ],
 |  
| 2752 |  | -        "average_daily_users": 150648,
 |  
|  | 2752 | +        "average_daily_users": 151067,
 |  
| 2753 | 2753 |          "categories": {
 |  
| 2754 | 2754 |            "android": [
 |  
| 2755 | 2755 |              "performance",
 |  
| ... | ... | @@ -2864,10 +2864,10 @@ |  
| 2864 | 2864 |            "category": "recommended"
 |  
| 2865 | 2865 |          },
 |  
| 2866 | 2866 |          "ratings": {
 |  
| 2867 |  | -          "average": 3.9003,
 |  
| 2868 |  | -          "bayesian_average": 3.8960318617843828,
 |  
| 2869 |  | -          "count": 1133,
 |  
| 2870 |  | -          "text_count": 401
 |  
|  | 2867 | +          "average": 3.8996,
 |  
|  | 2868 | +          "bayesian_average": 3.8953447616895223,
 |  
|  | 2869 | +          "count": 1136,
 |  
|  | 2870 | +          "text_count": 402
 |  
| 2871 | 2871 |          },
 |  
| 2872 | 2872 |          "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/reviews/",
 |  
| 2873 | 2873 |          "requires_payment": false,
 |  
| ... | ... | @@ -2886,7 +2886,7 @@ |  
| 2886 | 2886 |          "type": "extension",
 |  
| 2887 | 2887 |          "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/",
 |  
| 2888 | 2888 |          "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/versions/",
 |  
| 2889 |  | -        "weekly_downloads": 1940
 |  
|  | 2889 | +        "weekly_downloads": 1631
 |  
| 2890 | 2890 |        },
 |  
| 2891 | 2891 |        "notes": null
 |  
| 2892 | 2892 |      }
 |  projects/browser/build
 
 
| ... | ... | @@ -109,11 +109,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b |  
| 109 | 109 |    # Move READMEs from tor-expert-bundle to the doc dir
 |  
| 110 | 110 |    mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]
 |  
| 111 | 111 |  
 |  
| 112 |  | -  mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]
 |  
| 113 |  | -  mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %]
 |  
| 114 | 112 |    mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"
 |  
| 115 |  | -  mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"
 |  
| 116 |  | -  mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md"
 |  
| 117 | 113 |  
 |  
| 118 | 114 |    # Move the PTs to where TB expects them
 |  
| 119 | 115 |    mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %]
 |  projects/geckoview/config
 
 
| ... | ... | @@ -13,7 +13,7 @@ container: |  
| 13 | 13 |  var:
 |  
| 14 | 14 |    geckoview_version: 102.12.0esr
 |  
| 15 | 15 |    browser_branch: 12.5-1
 |  
| 16 |  | -  browser_build: 2
 |  
|  | 16 | +  browser_build: 3
 |  
| 17 | 17 |    copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
 |  
| 18 | 18 |    gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
 |  
| 19 | 19 |    git_commit: '[% exec("git rev-parse HEAD") %]'
 |  projects/tor-android-service/config
 
 
| 1 | 1 |  # vim: filetype=yaml sw=2
 |  
| 2 | 2 |  version: '[% c("abbrev") %]'
 |  
| 3 | 3 |  filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'
 |  
| 4 |  | -git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22
 |  
|  | 4 | +git_hash: f324999c1773a8d8c83c50106a2cac30be93aabf
 |  
| 5 | 5 |  git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git
 |  
| 6 | 6 |  git_submodule: 1
 |  
| 7 | 7 |  container:
 |  projects/tor-expert-bundle/build
 
 
| ... | ... | @@ -11,8 +11,6 @@ mkdir pluggable_transports && cd pluggable_transports |  
| 11 | 11 |  
 |  
| 12 | 12 |  tar -xkf $rootdir/[% c('input_files_by_name/lyrebird') %]
 |  
| 13 | 13 |  tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
 |  
| 14 |  | -tar -xkf $rootdir/[% c('input_files_by_name/webtunnel') %]
 |  
| 15 |  | -tar -xkf $rootdir/[% c('input_files_by_name/conjure') %]
 |  
| 16 | 14 |  
 |  
| 17 | 15 |  # copy in bridge lines for each pluggable transport
 |  
| 18 | 16 |  mv $rootdir/bridges_list.obfs4.txt .
 |  projects/tor-expert-bundle/config
 
 
| ... | ... | @@ -18,10 +18,6 @@ input_files: |  
| 18 | 18 |      project: lyrebird
 |  
| 19 | 19 |    - name: snowflake
 |  
| 20 | 20 |      project: snowflake
 |  
| 21 |  | -  - project: webtunnel
 |  
| 22 |  | -    name: webtunnel
 |  
| 23 |  | -  - name: conjure
 |  
| 24 |  | -    project: conjure    
 |  
| 25 | 21 |    - filename: pt_config.json
 |  
| 26 | 22 |    - filename: bridges_list.obfs4.txt
 |  
| 27 | 23 |    - filename: bridges_list.meek-azure.txt
 |  projects/tor-expert-bundle/pt_config.json
 
 
| ... | ... | @@ -2,9 +2,7 @@ |  
| 2 | 2 |    "recommendedDefault" : "obfs4",
 |  
| 3 | 3 |    "pluggableTransports" : {
 |  
| 4 | 4 |      "lyrebird" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}lyrebird${pt_extension}",
 |  
| 5 |  | -    "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}",
 |  
| 6 |  | -    "webtunnel" : "ClientTransportPlugin webtunnel exec ${pt_path}webtunnel-client${pt_extension}",
 |  
| 7 |  | -    "conjure" : "ClientTransportPlugin conjure exec ${pt_path}conjure-client${pt_extension} -registerURL https://registration.refraction.network/api"
 |  
|  | 5 | +    "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}"
 |  
| 8 | 6 |    },
 |  
| 9 | 7 |    "bridges" : {
 |  
| 10 | 8 |      "meek-azure" : [
 |  projects/tor-onion-proxy-library/0001-Bug-40800-Add-WebTunnel-support.patch
deleted
 
 
| 1 |  | -From 3a6f835e8089dd15f5cd6487b5cfbdfafe7422f8 Mon Sep 17 00:00:00 2001
 |  
| 2 |  | -From: Shelikhoo <xiaokangwang@xxxxxxxxxxx>
 |  
| 3 |  | -Date: Tue, 14 Feb 2023 16:59:59 +0000
 |  
| 4 |  | -Subject: [PATCH] add WebTunnel Support
 |  
| 5 |  | -
 |  
| 6 |  | ----
 |  
| 7 |  | - android/build.gradle                          |  3 +++
 |  
| 8 |  | - .../thali/toronionproxy/TorConfigBuilder.java | 19 +++++++++++++++----
 |  
| 9 |  | - 2 files changed, 18 insertions(+), 4 deletions(-)
 |  
| 10 |  | -
 |  
| 11 |  | -diff --git a/android/build.gradle b/android/build.gradle
 |  
| 12 |  | -index e107e8e..acd92c1 100644
 |  
| 13 |  | ---- a/android/build.gradle
 |  
| 14 |  | -+++ b/android/build.gradle
 |  
| 15 |  | -@@ -102,6 +102,9 @@ task copyPluggableTransports(type: Copy) {
 |  
| 16 |  | -     rename { filename ->
 |  
| 17 |  | -         filename.replace 'conjure-client', 'libConjure.so'
 |  
| 18 |  | -     }
 |  
| 19 |  | -+    rename { filename ->
 |  
| 20 |  | -+        filename.replace 'webtunnel-client', 'libWebtunnel.so'
 |  
| 21 |  | -+    }
 |  
| 22 |  | - }
 |  
| 23 |  | - 
 |  
| 24 |  | - gradle.projectsEvaluated {
 |  
| 25 |  | -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 |  
| 26 |  | -index b87993d..5e6d6c5 100644
 |  
| 27 |  | ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 |  
| 28 |  | -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 |  
| 29 |  | -@@ -109,8 +109,8 @@ public final class TorConfigBuilder {
 |  
| 30 |  | -         return this;
 |  
| 31 |  | -     }
 |  
| 32 |  | - 
 |  
| 33 |  | --    public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException {
 |  
| 34 |  | --        if (pluggableTransportObfs == null  || pluggableTransportSnow == null || pluggableTransportConjure == null) {
 |  
| 35 |  | -+    public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure, File pluggableTransportWebtunnel) throws IOException {
 |  
| 36 |  | -+        if (pluggableTransportObfs == null  || pluggableTransportSnow == null || pluggableTransportConjure == null || pluggableTransportWebtunnel == null) {
 |  
| 37 |  | -             return this;
 |  
| 38 |  | -         }
 |  
| 39 |  | - 
 |  
| 40 |  | -@@ -144,7 +144,17 @@ public final class TorConfigBuilder {
 |  
| 41 |  | -                     .getCanonicalPath());
 |  
| 42 |  | -         }
 |  
| 43 |  | - 
 |  
| 44 |  | --        transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath());
 |  
| 45 |  | -+        if (!pluggableTransportWebtunnel.exists()) {
 |  
| 46 |  | -+            throw new IOException("Webtunnel binary does not exist: " + pluggableTransportWebtunnel
 |  
| 47 |  | -+                    .getCanonicalPath());
 |  
| 48 |  | -+        }
 |  
| 49 |  | -+
 |  
| 50 |  | -+        if (!pluggableTransportWebtunnel.canExecute()) {
 |  
| 51 |  | -+            throw new IOException("Webtunnel binary is not executable: " + pluggableTransportWebtunnel
 |  
| 52 |  | -+                    .getCanonicalPath());
 |  
| 53 |  | -+        }
 |  
| 54 |  | -+
 |  
| 55 |  | -+        transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath(), pluggableTransportWebtunnel.getCanonicalPath());
 |  
| 56 |  | -         return this;
 |  
| 57 |  | -     }
 |  
| 58 |  | - 
 |  
| 59 |  | -@@ -511,10 +521,11 @@ public final class TorConfigBuilder {
 |  
| 60 |  | -         return transPort(settings.transPort());
 |  
| 61 |  | -     }
 |  
| 62 |  | - 
 |  
| 63 |  | --    public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) {
 |  
| 64 |  | -+    public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath, String webtunnelPath) {
 |  
| 65 |  | -         buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
 |  
| 66 |  | -         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");
 |  
| 67 |  | -         buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n");
 |  
| 68 |  | -+        buffer.append("ClientTransportPlugin webtunnel exec ").append(webtunnelPath).append('\n');
 |  
| 69 |  | -         return this;
 |  
| 70 |  | -     }
 |  
| 71 |  | - 
 |  
| 72 |  | --- 
 |  
| 73 |  | -2.34.1
 |  
| 74 |  | - |  projects/tor-onion-proxy-library/0001-Bug-41361-Add-conjure-support.patch
deleted
 
 
| 1 |  | -From edf4337158df11da3b6ef6d30050e2441cfeafeb Mon Sep 17 00:00:00 2001
 |  
| 2 |  | -From: Cecylia Bocovich <cohosh@xxxxxxxxxxxxxx>
 |  
| 3 |  | -Date: Thu, 13 Oct 2022 10:20:59 -0400
 |  
| 4 |  | -Subject: [PATCH] Bug 41361: Add conjure support
 |  
| 5 |  | -
 |  
| 6 |  | ----
 |  
| 7 |  | - android/build.gradle                           |  3 +++
 |  
| 8 |  | - .../thali/toronionproxy/TorConfigBuilder.java  | 18 ++++++++++++++----
 |  
| 9 |  | - 2 files changed, 17 insertions(+), 4 deletions(-)
 |  
| 10 |  | -
 |  
| 11 |  | -diff --git a/android/build.gradle b/android/build.gradle
 |  
| 12 |  | -index 2392731..b1aca0a 100644
 |  
| 13 |  | ---- a/android/build.gradle
 |  
| 14 |  | -+++ b/android/build.gradle
 |  
| 15 |  | -@@ -96,6 +96,9 @@ task copyPluggableTransports(type: Copy) {
 |  
| 16 |  | -     rename { filename ->
 |  
| 17 |  | -         filename.replace 'snowflake-client', 'libSnowflake.so'
 |  
| 18 |  | -     }
 |  
| 19 |  | -+    rename { filename ->
 |  
| 20 |  | -+        filename.replace 'conjure-client', 'libConjure.so'
 |  
| 21 |  | -+    }
 |  
| 22 |  | - }
 |  
| 23 |  | - 
 |  
| 24 |  | - gradle.projectsEvaluated {
 |  
| 25 |  | -diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 |  
| 26 |  | -index cc10783..c7e20c0 100644
 |  
| 27 |  | ---- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 |  
| 28 |  | -+++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java
 |  
| 29 |  | -@@ -109,8 +109,8 @@ public final class TorConfigBuilder {
 |  
| 30 |  | -         return this;
 |  
| 31 |  | -     }
 |  
| 32 |  | - 
 |  
| 33 |  | --    public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException {
 |  
| 34 |  | --        if (pluggableTransportObfs == null  || pluggableTransportSnow == null) {
 |  
| 35 |  | -+    public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow, File pluggableTransportConjure) throws IOException {
 |  
| 36 |  | -+        if (pluggableTransportObfs == null  || pluggableTransportSnow == null || pluggableTransportConjure == null) {
 |  
| 37 |  | -             return this;
 |  
| 38 |  | -         }
 |  
| 39 |  | - 
 |  
| 40 |  | -@@ -124,6 +124,11 @@ public final class TorConfigBuilder {
 |  
| 41 |  | -                     .getCanonicalPath());
 |  
| 42 |  | -         }
 |  
| 43 |  | - 
 |  
| 44 |  | -+        if (!pluggableTransportConjure.exists()) {
 |  
| 45 |  | -+            throw new IOException("Conjure binary does not exist: " + pluggableTransportConjure
 |  
| 46 |  | -+                    .getCanonicalPath());
 |  
| 47 |  | -+        }
 |  
| 48 |  | -+
 |  
| 49 |  | -         if (!pluggableTransportObfs.canExecute()) {
 |  
| 50 |  | -             throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs
 |  
| 51 |  | -                     .getCanonicalPath());
 |  
| 52 |  | -@@ -134,8 +139,12 @@ public final class TorConfigBuilder {
 |  
| 53 |  | -                     .getCanonicalPath());
 |  
| 54 |  | -         }
 |  
| 55 |  | - 
 |  
| 56 |  | -+        if (!pluggableTransportConjure.canExecute()) {
 |  
| 57 |  | -+            throw new IOException("Conjure binary is not executable: " + pluggableTransportConjure
 |  
| 58 |  | -+                    .getCanonicalPath());
 |  
| 59 |  | -+        }
 |  
| 60 |  | - 
 |  
| 61 |  | --        transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath());
 |  
| 62 |  | -+        transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath(), pluggableTransportConjure.getCanonicalPath());
 |  
| 63 |  | -         return this;
 |  
| 64 |  | -     }
 |  
| 65 |  | - 
 |  
| 66 |  | -@@ -502,9 +511,10 @@ public final class TorConfigBuilder {
 |  
| 67 |  | -         return transPort(settings.transPort());
 |  
| 68 |  | -     }
 |  
| 69 |  | - 
 |  
| 70 |  | --    public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) {
 |  
| 71 |  | -+    public TorConfigBuilder transportPlugin(String obfsPath, String snowPath, String conjurePath) {
 |  
| 72 |  | -         buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n');
 |  
| 73 |  | -         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");
 |  
| 74 |  | -+        buffer.append("ClientTransportPlugin conjure exec ").append(conjurePath).append(" -registerURL https://registration.refraction.network/api\n");
 |  
| 75 |  | -         return this;
 |  
| 76 |  | -     }
 |  
| 77 |  | - 
 |  
| 78 |  | --- 
 |  
| 79 |  | -2.37.2
 |  
| 80 |  | - |  projects/tor-onion-proxy-library/build
 
 
| ... | ... | @@ -24,8 +24,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] |  
| 24 | 24 |  patch -p1 < $rootdir/gradle.patch
 |  
| 25 | 25 |  patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
 |  
| 26 | 26 |  patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch
 |  
| 27 |  | -patch -p1 < $rootdir/0001-Bug-41361-Add-conjure-support.patch
 |  
| 28 |  | -patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch
 |  
| 29 | 27 |  
 |  
| 30 | 28 |  [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
 |  
| 31 | 29 |    # Extract tor-expert-bundle
 |  
| ... | ... | @@ -40,20 +38,12 @@ patch -p1 < $rootdir/0001-Bug-40800-Add-WebTunnel-support.patch |  
| 40 | 38 |      cp $ptdir/lyrebird external/pluto/bin/armeabi/obfs4proxy
 |  
| 41 | 39 |      cp $ptdir/snowflake-client external/pluto/bin/armeabi-v7a/
 |  
| 42 | 40 |      cp $ptdir/snowflake-client external/pluto/bin/armeabi/
 |  
| 43 |  | -    cp $ptdir/conjure-client external/pluto/bin/armeabi-v7a/
 |  
| 44 |  | -    cp $ptdir/conjure-client external/pluto/bin/armeabi/
 |  
| 45 |  | -    cp $ptdir/webtunnel-client external/pluto/bin/armeabi-v7a/
 |  
| 46 |  | -    cp $ptdir/webtunnel-client external/pluto/bin/armeabi/
 |  
| 47 | 41 |    [% ELSIF arch == "aarch64" -%]
 |  
| 48 | 42 |      cp $ptdir/lyrebird external/pluto/bin/arm64-v8a/obfs4proxy
 |  
| 49 | 43 |      cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/
 |  
| 50 |  | -    cp $ptdir/conjure-client external/pluto/bin/arm64-v8a/
 |  
| 51 |  | -    cp $ptdir/webtunnel-client external/pluto/bin/arm64-v8a/
 |  
| 52 | 44 |    [% ELSE -%]
 |  
| 53 | 45 |      cp $ptdir/lyrebird external/pluto/bin/[% arch %]/obfs4proxy
 |  
| 54 | 46 |      cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/
 |  
| 55 |  | -    cp $ptdir/conjure-client external/pluto/bin/[% arch %]/
 |  
| 56 |  | -    cp $ptdir/webtunnel-client external/pluto/bin/[% arch %]/
 |  
| 57 | 47 |    [% END -%]
 |  
| 58 | 48 |  [% END -%]
 |  
| 59 | 49 |  
 |  projects/tor-onion-proxy-library/config
 
 
| ... | ... | @@ -40,5 +40,3 @@ input_files: |  
| 40 | 40 |    - filename: gradle.patch
 |  
| 41 | 41 |    - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
 |  
| 42 | 42 |    - filename: 0001-Bug-30318-Add-snowflake-support.patch |  
| 43 |  | -  - filename: 0001-Bug-41361-Add-conjure-support.patch
 |  
| 44 |  | -  - filename: 0001-Bug-40800-Add-WebTunnel-support.patch |  projects/translation/config
 
 
| ... | ... | @@ -6,19 +6,19 @@ version: '[% c("abbrev") %]' |  
| 6 | 6 |  steps:
 |  
| 7 | 7 |    base-browser:
 |  
| 8 | 8 |      base-browser: '[% INCLUDE build %]'
 |  
| 9 |  | -    git_hash: 0a429fd14e8ebe9edcdbaac933c86b4bac8fcb19
 |  
|  | 9 | +    git_hash: 142fc4c709c2c5feee837a8aa7aa8ff89f9a38e1
 |  
| 10 | 10 |      targets:
 |  
| 11 | 11 |        nightly:
 |  
| 12 | 12 |          git_hash: 'base-browser'
 |  
| 13 | 13 |    base-browser-fluent:
 |  
| 14 | 14 |      base-browser-fluent: '[% INCLUDE build %]'
 |  
| 15 |  | -    git_hash: c68657f80050975474903f170250e2888c2a1fea
 |  
|  | 15 | +    git_hash: 5625681dc2e6320f82a3d4037c81421fc642b85a
 |  
| 16 | 16 |      targets:
 |  
| 17 | 17 |        nightly:
 |  
| 18 | 18 |          git_hash: 'basebrowser-newidentityftl'
 |  
| 19 | 19 |    tor-browser:
 |  
| 20 | 20 |      tor-browser: '[% INCLUDE build %]'
 |  
| 21 |  | -    git_hash: 0cd2ac8d14ce4acd8c9781376a9fdcb9c8323b91
 |  
|  | 21 | +    git_hash: b41ec1d4c1e11668191d9e778ad4732c765bccdd
 |  
| 22 | 22 |      targets:
 |  
| 23 | 23 |        nightly:
 |  
| 24 | 24 |          git_hash: 'tor-browser'
 |  
| ... | ... | @@ -26,7 +26,7 @@ steps: |  
| 26 | 26 |      fenix: '[% INCLUDE build %]'
 |  
| 27 | 27 |      # We need to bump the commit before releasing but just pointing to a branch
 |  
| 28 | 28 |      # might cause too much rebuidling of the Firefox part.
 |  
| 29 |  | -    git_hash: 1b094bdfaa444d31f06fe7c0261de89ae67083cc
 |  
|  | 29 | +    git_hash: 0391f2fee1299923d67a836043a109656457e0e8
 |  
| 30 | 30 |      targets:
 |  
| 31 | 31 |        nightly:
 |  
| 32 | 32 |          git_hash: 'fenix-torbrowserstringsxml'
 |  rbm.conf
 
 
| ... | ... | @@ -94,12 +94,12 @@ buildconf: |  
| 94 | 94 |    git_signtag_opt: '-s'
 |  
| 95 | 95 |  
 |  
| 96 | 96 |  var:
 |  
| 97 |  | -  torbrowser_version: '12.5a7'
 |  
|  | 97 | +  torbrowser_version: '12.5.0'
 |  
| 98 | 98 |    torbrowser_build: 'build1'
 |  
| 99 | 99 |    torbrowser_incremental_from:
 |  
| 100 |  | -    - 12.5a4
 |  
| 101 |  | -    - 12.5a5
 |  
| 102 |  | -    - 12.5a6
 |  
|  | 100 | +    - 12.0.7
 |  
|  | 101 | +    - 12.0.6
 |  
|  | 102 | +    - 12.0.5
 |  
| 103 | 103 |    updater_enabled: 1
 |  
| 104 | 104 |    build_mar: 1
 |  
| 105 | 105 |    mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
 |  
 |