[Git][tpo/applications/tor-browser-build][main] 4 commits: Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality

9 Aug 2023


      richard pushed to branch main at The Tor Project / Applications / tor-browser-build


Commits:
ec97c9d3 by Richard Pospesel at 2023-08-09T12:38:17+02:00
Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality

- - - - -
9f038fb2 by Nicolas Vigier at 2023-08-09T12:38:19+02:00
Bug 40916: Pull Mullvad mar files from archive.torproject.org

In order to generate incrementals, get mar files from the previous
version from archive.tpo instead of the Mullvad mirrors, since that
release is not always there but should always be on archive.tpo.

- - - - -
da34986c by Pier Angelo Vendrame at 2023-08-09T17:14:21+02:00
MB 199 (fix): Use -L to copy Mullvad Browser's Fluent files.

We need to use the -L option when copying MB's Fluent files because on
macOS we symlink ja-JP-mac to ja.

- - - - -
c70c38d5 by Richard Pospesel at 2023-08-09T17:16:07+02:00
Bug 40901, 40902: Prepare Tor+Mullvad Browser Alpha 13.0a2

- - - - -


15 changed files:

- projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
- projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
- projects/browser/allowed_addons.json
- projects/browser/config
- projects/firefox-android/config
- projects/firefox/build
- projects/firefox/config
- projects/geckoview/config
- projects/go/config
- projects/openssl/config
- projects/release/update_responses_config.yml
- projects/tor/build
- projects/tor/config
- projects/translation/config
- rbm.conf


Changes:

=====================================
projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt
=====================================
@@ -1,3 +1,37 @@
+Mullvad Browser 13.0a2 - August 08 2023
+ * All Platforms
+   * Updated NoScript to 11.4.26
+   * Upated uBlock Origin to 1.51.0
+   * Updated Firefox to 115.1.0esr
+   * Bug 195: Choose which locales to translate Mullvad Browser to [mullvad-browser]
+   * Bug 216: Rebase Mullvad Browser onto 115.1.0esr [mullvad-browser]
+   * Bug 30556: Re-evaluate letterboxing dimension choices [tor-browser]
+   * Bug 33282: Increase the max width of new windows [tor-browser]
+   * Bug 40916: Update updated_responses_config.yml to pull Mullvad incrementals from archive.torproject.org [tor-browser-build]
+ * Build System
+   * All Platforms
+     * Bug 198: Enable localization for Mullvad Browser builds [mullvad-browser]
+     * Bug 199: Mullvad Browser changes required to use Mullvad Browser-specific localization strings [mullvad-browser]
+     * Bug 40615: Consider adding a readme to the fonts directory [tor-browser-build]
+     * Bug 40880: The README doesn't include some dependencies needed for building incrementals [tor-browser-build]
+     * Bug 40907: Mar-tools aren't deterministic on 13.0a1 [tor-browser-build]
+     * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build]
+     * Bug 40913: add boklm back to list of taggers in relevant projects [tor-browser-build]
+
+Mullvad Browser 12.5.2 - July 31 2023
+ * All Platforms
+   * Updated NoScript to 11.4.26
+   * Upated uBlock Origin to 1.51.0
+   * Updated Firefox to 102.14.0esr
+   * Bug 217: Rebase Mullvad Browser 12.5 stable on top of 102.14esr [mullvad-browser]
+ * Build System
+   * All Platforms
+     * Bug 40889: Add mullvad sha256sums URL to tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build]
+     * Bug 40894: Fix format of keyring/boklm.gpg [tor-browser-build]
+     * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build]
+   * Windows
+     * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build]
+
 Mullvad Browser 13.0a1 - July 20 2023
  * All Platforms
    * Updated NoScript to 11.4.25


=====================================
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
=====================================
@@ -1,3 +1,67 @@
+Tor Browser 13.0a2 - August 08 2023
+ * All Platforms
+   * Updated Translations
+   * Updated NoScript to 11.4.26
+   * Updated OpenSSL to 3.0.10
+   * Updated tor to 0.4.8.3-rc
+   * Bug 41909: Rebase 13.0 alpha to 115.1.0 esr [tor-browser]
+ * Windows + macOS + Linux
+   * Updated Firefox to 115.1.0esr
+   * Bug 30556: Re-evaluate letterboxing dimension choices [tor-browser]
+   * Bug 33282: Increase the max width of new windows [tor-browser]
+   * Bug 40982: Cleanup maps in tor-circuit-display [tor-browser]
+   * Bug 40983: Move not UI-related torbutton.js code to modules [tor-browser]
+   * Bug 41844: Stop using the control port directly [tor-browser]
+   * Bug 41907: The bootstrap is interrupted without any errors if the process becomes ready when already bootstrapping [tor-browser]
+   * Bug 41922: Unify the bridge line parsers [tor-browser]
+   * Bug 41923: The path normalization results in warnings [tor-browser]
+   * Bug 41924: Small refactors for TorProcess [tor-browser]
+   * Bug 41925: Remove the torbutton startup process [tor-browser]
+   * Bug 41926: Refactor the control port client implementation [tor-browser]
+   * Bug 41964: 'emojiAnnotations' not defined in time in connection preferences [tor-browser]
+ * Android
+   * Updated GeckoView to 115.1.0esr
+   * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser]
+ * Build System
+   * All Platforms
+     * Updated Go to 1.20.7
+     * Bug 31588: Be smarter about vendoring for Rust projects [tor-browser-build]
+     * Bug 40855: Update toolchains for Mozilla 115 [tor-browser-build]
+     * Bug 40880: The README doesn't include some dependencies needed for building incrementals [tor-browser-build]
+     * Bug 40905: Go vendor archives ignore the nightly version override on testbuilds [tor-browser-build]
+     * Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality [tor-browser-build]
+     * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build]
+     * Bug 40913: add boklm back to list of taggers in relevant projects [tor-browser-build]
+   * Windows + macOS + Linux
+     * Bug 40615: Consider adding a readme to the fonts directory [tor-browser-build]
+     * Bug 40907: Mar-tools aren't deterministic on 13.0a1 [tor-browser-build]
+   * Windows
+     * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build]
+   * Android
+     * Bug 40867: Create a RBM project for the unified Android repository [tor-browser-build]
+     * Bug 41899: Use LLD for Android [tor-browser]
+
+Tor Browser 12.5.2 - July 31 2023
+ * All Platforms
+   * Updated Translations
+   * Updated NoScript to 11.4.26
+   * Bug 41908: Rebase stable 12.5 to 102.14esr [tor-browser]
+ * Windows + macOS + Linux
+   * Updated Firefox to 102.14.0esr
+ * Windows
+   * Bug 41761: xul.dll win crash tor-browser 12.5.1 (based on Mozilla Firefox 102.13.0esr) (64-Bit) [tor-browser]
+ * Android
+   * Updated GeckoView to 102.14.0esr
+   * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser]
+ * Build System
+   * All Platforms
+     * Updated Go to 1.20.6
+     * Bug 40889: Add mullvad sha256sums URL to tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo [tor-browser-build]
+     * Bug 40894: Fix format of keyring/boklm.gpg [tor-browser-build]
+     * Bug 40909: Add dan_b and ma1 to list of taggers in relevant projects [tor-browser-build]
+   * Windows
+     * Bug 31546: Create and expose PDB files for Tor Browser debugging on Windows [tor-browser-build]
+
 Tor Browser 13.0a1 - July 20 2023
  * All Platforms
    * Updated Translations


=====================================
projects/browser/allowed_addons.json
=====================================
@@ -17,7 +17,7 @@
             "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.png..."
           }
         ],
-        "average_daily_users": 962293,
+        "average_daily_users": 963152,
         "categories": {
           "android": [
             "experimental",
@@ -221,10 +221,10 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.5599,
-          "bayesian_average": 4.558742718876036,
-          "count": 5081,
-          "text_count": 1597
+          "average": 4.5592,
+          "bayesian_average": 4.55804261202379,
+          "count": 5093,
+          "text_count": 1604
         },
         "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": 23021
+        "weekly_downloads": 24659
       },
       "notes": null
     },
@@ -337,7 +337,7 @@
             "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?m..."
           }
         ],
-        "average_daily_users": 249664,
+        "average_daily_users": 249415,
         "categories": {
           "android": [
             "security-privacy"
@@ -553,9 +553,9 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.8163,
-          "bayesian_average": 4.811654069453744,
-          "count": 1350,
+          "average": 4.816,
+          "bayesian_average": 4.811352368325867,
+          "count": 1353,
           "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": 3297
+        "weekly_downloads": 3670
       },
       "notes": null
     },
@@ -657,7 +657,7 @@
             "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?m..."
           }
         ],
-        "average_daily_users": 1077131,
+        "average_daily_users": 1076698,
         "categories": {
           "android": [
             "security-privacy"
@@ -1180,9 +1180,9 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.8004,
-          "bayesian_average": 4.797633164122742,
-          "count": 2259,
+          "average": 4.8009,
+          "bayesian_average": 4.798135100629341,
+          "count": 2265,
           "text_count": 431
         },
         "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/",
@@ -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": 17147
+        "weekly_downloads": 18718
       },
       "notes": null
     },
@@ -1223,7 +1223,7 @@
             "picture_url": null
           }
         ],
-        "average_daily_users": 6213889,
+        "average_daily_users": 6229783,
         "categories": {
           "android": [
             "security-privacy"
@@ -1388,7 +1388,7 @@
         },
         "is_disabled": false,
         "is_experimental": false,
-        "last_updated": "2023-07-25T13:50:33Z",
+        "last_updated": "2023-08-07T17:15:41Z",
         "name": {
           "ar": "uBlock Origin",
           "bg": "uBlock Origin",
@@ -1533,10 +1533,10 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.782,
-          "bayesian_average": 4.781604256114891,
-          "count": 15731,
-          "text_count": 4091
+          "average": 4.7828,
+          "bayesian_average": 4.782404807048353,
+          "count": 15798,
+          "text_count": 4101
         },
         "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": 129273
+        "weekly_downloads": 143905
       },
       "notes": null
     },
@@ -1614,7 +1614,7 @@
             "picture_url": null
           }
         ],
-        "average_daily_users": 167699,
+        "average_daily_users": 167376,
         "categories": {
           "android": [
             "photos-media"
@@ -1713,10 +1713,10 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.4916,
-          "bayesian_average": 4.486471885365025,
-          "count": 1129,
-          "text_count": 422
+          "average": 4.4929,
+          "bayesian_average": 4.487789225993283,
+          "count": 1132,
+          "text_count": 423
         },
         "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/rev...",
         "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/ver...",
-        "weekly_downloads": 367
+        "weekly_downloads": 328
       },
       "notes": null
     },
@@ -1754,7 +1754,7 @@
             "picture_url": null
           }
         ],
-        "average_daily_users": 85522,
+        "average_daily_users": 85334,
         "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": 1659
+        "weekly_downloads": 1565
       },
       "notes": null
     },
@@ -1908,7 +1908,7 @@
             "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.png..."
           }
         ],
-        "average_daily_users": 257323,
+        "average_daily_users": 257984,
         "categories": {
           "android": [
             "photos-media",
@@ -2127,10 +2127,10 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.652,
-          "bayesian_average": 4.647356910324775,
-          "count": 1296,
-          "text_count": 249
+          "average": 4.6539,
+          "bayesian_average": 4.64926734511088,
+          "count": 1303,
+          "text_count": 250
         },
         "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/",
         "requires_payment": false,
@@ -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": 4065
+        "weekly_downloads": 4027
       },
       "notes": null
     },
@@ -2174,7 +2174,7 @@
             "picture_url": null
           }
         ],
-        "average_daily_users": 111166,
+        "average_daily_users": 111124,
         "categories": {
           "android": [
             "other"
@@ -2457,10 +2457,10 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.4202,
-          "bayesian_average": 4.41559222474328,
-          "count": 1228,
-          "text_count": 332
+          "average": 4.4123,
+          "bayesian_average": 4.407708861807205,
+          "count": 1232,
+          "text_count": 334
         },
         "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": 33
+        "weekly_downloads": 30
       },
       "notes": null
     },
@@ -2496,7 +2496,7 @@
             "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified=..."
           }
         ],
-        "average_daily_users": 301822,
+        "average_daily_users": 301669,
         "categories": {
           "android": [
             "performance",
@@ -2686,10 +2686,10 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 4.404,
-          "bayesian_average": 4.401301959464707,
-          "count": 2089,
-          "text_count": 810
+          "average": 4.4047,
+          "bayesian_average": 4.402001757843669,
+          "count": 2093,
+          "text_count": 811
         },
         "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": 7807
+        "weekly_downloads": 7783
       },
       "notes": null
     },
@@ -2749,7 +2749,7 @@
             "picture_url": null
           }
         ],
-        "average_daily_users": 149721,
+        "average_daily_users": 150191,
         "categories": {
           "android": [
             "performance",
@@ -2864,9 +2864,9 @@
           "category": "recommended"
         },
         "ratings": {
-          "average": 3.9005,
-          "bayesian_average": 3.89624887816371,
-          "count": 1146,
+          "average": 3.9015,
+          "bayesian_average": 3.8972613162211953,
+          "count": 1147,
           "text_count": 406
         },
         "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revie...",
@@ -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/versi...",
-        "weekly_downloads": 1670
+        "weekly_downloads": 1838
       },
       "notes": null
     }


=====================================
projects/browser/config
=====================================
@@ -104,9 +104,9 @@ input_files:
   - URL: https://addons.mozilla.org/firefox/downloads/file/4141345/noscript-11.4.26.x...
     name: noscript
     sha256sum: 283db0eaebbd2888c1a852f5acabaa8e0225ff1eb1a97a25bceaedfd14d9f44c
-  - URL: https://addons.mozilla.org/firefox/downloads/file/4121906/ublock_origin-1.50...
+  - URL: https://addons.mozilla.org/firefox/downloads/file/4141256/ublock_origin-1.51...
     name: ublock-origin
-    sha256sum: 10618003e70b528c3f17996e373146d39e6b15f777ac4ca1f214da2ffdb7a5b3
+    sha256sum: 8b73468bc233a11dd2895219466381783d19123857dd0b6fd16a01820fca4834
     enable: '[% c("var/mullvad-browser") %]'
   - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firefo...
     name: mullvad-extension


=====================================
projects/firefox-android/config
=====================================
@@ -16,7 +16,7 @@ container:
 var:
   fenix_version: 115.2.0
   browser_branch: 13.0-1
-  browser_build: 1
+  browser_build: 2
   platform_version: 115.0
   variant: Beta
   # This should be updated when the list of gradle dependencies is changed.


=====================================
projects/firefox/build
=====================================
@@ -159,7 +159,7 @@ mkdir "$HOME/.mozbuild"
     pushd "$rootdir/translation-mullvad-browser"
     ln -s ja ja-JP-mac
     for lang in $supported_locales; do
-      cp -r $lang "$l10ncentral/"
+      cp -Lr $lang "$l10ncentral/"
     done
     popd
   [% END -%]


=====================================
projects/firefox/config
=====================================
@@ -14,11 +14,11 @@ container:
   use_container: 1
 
 var:
-  firefox_platform_version: 115.0.2
+  firefox_platform_version: 115.1.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   browser_series: '13.0'
   browser_branch: '[% c("var/browser_series") %]-1'
-  browser_build: 3
+  browser_build: 4
   branding_directory_prefix: 'tb'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
@@ -85,7 +85,7 @@ targets:
     git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
     var:
       branding_directory_prefix: 'mb'
-      browser_build: 2
+      browser_build: 3
       gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
 
   linux-x86_64:


=====================================
projects/geckoview/config
=====================================
@@ -16,7 +16,7 @@ container:
 var:
   geckoview_version: 115.1.0esr
   browser_branch: 13.0-1
-  browser_build: 2
+  browser_build: 4
   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/go/config
=====================================
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.20.6
+version: 1.20.7
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 container:
   use_container: 1
@@ -119,7 +119,7 @@ input_files:
     enable: '[% ! c("var/linux") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
     name: go
-    sha256sum: 62ee5bc6fb55b8bae8f705e0cb8df86d6453626b4ecf93279e2867092e0b7f70
+    sha256sum: 2c5ee9c9ec1e733b0dbbc2bdfed3f62306e51d8172bf38f4f4e542b27520f597
   - project: go-bootstrap
     name: go-bootstrap
     target_replace:


=====================================
projects/openssl/config
=====================================
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 3.0.9
+version: 3.0.10
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
 container:
   use_container: 1
@@ -33,4 +33,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-    sha256sum: eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
+    sha256sum: 1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323


=====================================
projects/release/update_responses_config.yml
=====================================
@@ -10,13 +10,12 @@ appname_bundle_win64: '[% c("var/projectname") %]-install-win64'
 releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %]
 download:
     gpg_keyring: ../../keyring/torbrowser.gpg
+    archive_url: 'https://archive.torproject.org/tor-package-archive/[% c("var/projectname") %]'
 [% IF c("var/tor-browser") -%]
-    archive_url: 'https://archive.torproject.org/tor-package-archive/torbrowser'
     bundles_url: 'https://dist.torproject.org/torbrowser'
     mars_url: 'https://cdn.torproject.org/aus1/torbrowser'
 [% END -%]
 [% IF c("var/mullvad-browser") -%]
-    archive_url: 'https://cdn.mullvad.net/browser'
     bundles_url: 'https://cdn.mullvad.net/browser'
     mars_url: 'https://cdn.mullvad.net/browser'
 [% END -%]


=====================================
projects/tor/build
=====================================
@@ -73,7 +73,7 @@ find -type f -print0 | xargs -0 [% c("touch") %]
     [% IF c("var/windows") || c("var/android") %]--with-zlib-dir="$zlibdir"[% END %] \
     [% IF c("var/macos") %]--enable-static-openssl[% END %] \
     [% IF c("var/windows") %]--enable-static-libevent --enable-static-openssl --enable-static-zlib[% END %] \
-    --prefix="$distdir" [% c("var/configure_opt") %]
+    --enable-gpl --prefix="$distdir" [% c("var/configure_opt") %]
 [% IF c("var/macos") -%]
   export LD_PRELOAD=[% c("var/faketime_path") %]
   export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"


=====================================
projects/tor/config
=====================================
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
-version: 0.4.8.2-alpha
+version: 0.4.8.3-rc
 git_hash: 'tor-[% c("version") %]'
 git_url: https://gitlab.torproject.org/tpo/core/tor.git
 git_submodule: 1


=====================================
projects/translation/config
=====================================
@@ -12,19 +12,19 @@ compress_tar: 'gz'
 steps:
   base-browser:
     base-browser: '[% INCLUDE build %]'
-    git_hash: 060d9d04b3a4c3e0f09f3f5fa8ad3ab12e2f4e80
+    git_hash: f940956c425c199f622f53fef9a735fc303b11f1
     targets:
       nightly:
         git_hash: 'base-browser'
   base-browser-fluent:
     base-browser-fluent: '[% INCLUDE build %]'
-    git_hash: 6f64004400616a5956d1823a0e8176b60d212090
+    git_hash: 72c0d47f55994b6d68e0239d9edd02d7ae7708ab
     targets:
       nightly:
         git_hash: 'basebrowser-newidentityftl'
   tor-browser:
     tor-browser: '[% INCLUDE build %]'
-    git_hash: d8d2b8f3200aa309f44f2fa80625ff8e6a25bb78
+    git_hash: 2b885b2a6dfeaa046678133755639d6e26485754
     targets:
       nightly:
         git_hash: 'tor-browser'


=====================================
rbm.conf
=====================================
@@ -81,12 +81,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '13.0a1'
+  torbrowser_version: '13.0a2'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 12.5a5
-    - 12.5a6
-    - 12.5a7
+    - '13.0a1'
   updater_enabled: 1
   build_mar: 1
   mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
@@ -302,9 +300,6 @@ targets:
         - tr
         - zh-CN
         - zh-TW
-      torbrowser_build: 'build2'
-      torbrowser_incremental_from:
-        - 12.5a7
 
   torbrowser-testbuild:
     - testbuild



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/a...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/a...
You're receiving this email because of your account on gitlab.torproject.org.

    

richard (＠richard)

tags

participants (1)