diff --git a/projects/browser/Bundle-Data/Docs/ChangeLog.txt b/projects/browser/Bundle-Data/Docs/ChangeLog.txt
index 175829635ec1989603055100f91dfb56dfbd2229..96694c93d9433a78f5bc44b89ebab19bd9c93ce4 100644
--- a/projects/browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,23 @@
+Tor Browser 12.0.1 - December 14 2022
+ * Windows + macOS + Linux
+ * Updated Firefox to 102.6esr
+ * Bug 41519: TOR_SOCKS_IPC_PATH environment variable not honored [tor-browser]
+ * Bug 41520: Regression: rearranging bookmarks / place items by drag & drop doesn't work anymore [tor-browser]
+ * Android
+ * Updated GeckoView to 102.6esr
+ * Build System
+ * All Platforms
+ * Updated Go to 1.19.4
+ * Bug 40653: Build compiler-rt with runtimes instead of the main LLVM build [tor-browser-build]
+ * Bug 40681: Run apt-get clean, after installing packages in projects/container-image/config [tor-browser-build]
+ * Bug 40683: Install more packages in the default containers to reduce the number of custom containers [tor-browser-build]
+ * Bug 40693: Can't build container-image in main [tor-browser-build]
+ * Bug 40705: Add empty commit mentioning that gitolite repo is no longer updated [tor-browser-build]
+ * Windows
+ * Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe [tor-browser-build]
+ * Linux
+ * Bug 40689: Update Ubuntu version from projects/mmdebstrap-image/config to 22.04.1 [tor-browser-build]
+
Tor Browser 12.0 - December 5 2022
* All Platforms
* Update Translations
diff --git a/projects/browser/allowed_addons.json b/projects/browser/allowed_addons.json
index d9672f63ab7cd45d42ad4d17439f0240bc35164d..d36d36c5dc32359f3ab8ae3a3df3394407460c4a 100644
--- a/projects/browser/allowed_addons.json
+++ b/projects/browser/allowed_addons.json
@@ -17,7 +17,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.png?modified=1565722641"
}
],
- "average_daily_users": 915519,
+ "average_daily_users": 931676,
"categories": {
"android": [
"experimental",
@@ -221,10 +221,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.5589,
- "bayesian_average": 4.557679323413176,
- "count": 4716,
- "text_count": 1505
+ "average": 4.5581,
+ "bayesian_average": 4.556880457185879,
+ "count": 4723,
+ "text_count": 1508
},
"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": 28250
+ "weekly_downloads": 28481
},
"notes": null
},
@@ -337,7 +337,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?modified=1469820907"
}
],
- "average_daily_users": 669677,
+ "average_daily_users": 679121,
"categories": {
"android": [
"security-privacy"
@@ -469,9 +469,9 @@
"category": "spotlight"
},
"ratings": {
- "average": 4.6597,
- "bayesian_average": 4.657149505820861,
- "count": 2307,
+ "average": 4.6594,
+ "bayesian_average": 4.65683895233368,
+ "count": 2308,
"text_count": 460
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/",
@@ -501,7 +501,7 @@
"type": "extension",
"url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/",
"versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/",
- "weekly_downloads": 6221
+ "weekly_downloads": 6282
},
"notes": null
},
@@ -517,7 +517,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?modified=1550343990"
}
],
- "average_daily_users": 257360,
+ "average_daily_users": 260954,
"categories": {
"android": [
"security-privacy"
@@ -733,7 +733,7 @@
},
"ratings": {
"average": 4.82,
- "bayesian_average": 4.815277608880884,
+ "bayesian_average": 4.815272675239451,
"count": 1300,
"text_count": 234
},
@@ -820,7 +820,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": 5300
+ "weekly_downloads": 5737
},
"notes": null
},
@@ -836,7 +836,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?modified=1469820907"
}
],
- "average_daily_users": 1084595,
+ "average_daily_users": 1101611,
"categories": {
"android": [
"security-privacy"
@@ -1358,10 +1358,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.7954,
- "bayesian_average": 4.792545624484679,
- "count": 2141,
- "text_count": 421
+ "average": 4.7955,
+ "bayesian_average": 4.792644702996817,
+ "count": 2142,
+ "text_count": 422
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/",
"requires_payment": false,
@@ -1385,7 +1385,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": 19509
+ "weekly_downloads": 20003
},
"notes": null
},
@@ -1401,7 +1401,7 @@
"picture_url": null
}
],
- "average_daily_users": 6142453,
+ "average_daily_users": 6260785,
"categories": {
"android": [
"security-privacy"
@@ -1565,7 +1565,7 @@
},
"is_disabled": false,
"is_experimental": false,
- "last_updated": "2022-11-29T17:10:20Z",
+ "last_updated": "2022-12-09T16:25:27Z",
"name": {
"ar": "uBlock Origin",
"bg": "uBlock Origin",
@@ -1710,10 +1710,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.7782,
- "bayesian_average": 4.777784259376361,
- "count": 14646,
- "text_count": 3840
+ "average": 4.7783,
+ "bayesian_average": 4.777884356510374,
+ "count": 14661,
+ "text_count": 3843
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/",
"requires_payment": false,
@@ -1775,7 +1775,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": 150038
+ "weekly_downloads": 155177
},
"notes": null
},
@@ -1791,7 +1791,7 @@
"picture_url": null
}
],
- "average_daily_users": 138306,
+ "average_daily_users": 138965,
"categories": {
"android": [
"photos-media"
@@ -1913,7 +1913,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/versions/",
- "weekly_downloads": 364
+ "weekly_downloads": 335
},
"notes": null
},
@@ -1929,7 +1929,7 @@
"picture_url": null
}
],
- "average_daily_users": 93276,
+ "average_daily_users": 94303,
"categories": {
"android": [
"experimental",
@@ -2066,7 +2066,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": 611
+ "weekly_downloads": 665
},
"notes": null
},
@@ -2082,7 +2082,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.png?modified=1651263207"
}
],
- "average_daily_users": 242839,
+ "average_daily_users": 245350,
"categories": {
"android": [
"photos-media",
@@ -2300,10 +2300,10 @@
"category": "recommended"
},
"ratings": {
- "average": 4.6481,
- "bayesian_average": 4.643208419519093,
- "count": 1202,
- "text_count": 234
+ "average": 4.6487,
+ "bayesian_average": 4.643806966863276,
+ "count": 1204,
+ "text_count": 236
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/",
"requires_payment": false,
@@ -2324,7 +2324,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": 4261
+ "weekly_downloads": 4231
},
"notes": null
},
@@ -2347,7 +2347,7 @@
"picture_url": null
}
],
- "average_daily_users": 98361,
+ "average_daily_users": 98953,
"categories": {
"android": [
"other"
@@ -2629,9 +2629,9 @@
"category": "recommended"
},
"ratings": {
- "average": 4.4377,
- "bayesian_average": 4.432981831118983,
- "count": 1179,
+ "average": 4.4378,
+ "bayesian_average": 4.433084802866931,
+ "count": 1181,
"text_count": 316
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/",
@@ -2652,7 +2652,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": 45
+ "weekly_downloads": 30
},
"notes": null
},
@@ -2668,7 +2668,7 @@
"picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified=1506804587"
}
],
- "average_daily_users": 331130,
+ "average_daily_users": 335017,
"categories": {
"android": [
"performance",
@@ -2858,7 +2858,7 @@
},
"ratings": {
"average": 4.4075,
- "bayesian_average": 4.404750805731901,
+ "bayesian_average": 4.404748711196217,
"count": 2010,
"text_count": 787
},
@@ -2904,7 +2904,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": 7694
+ "weekly_downloads": 7735
},
"notes": null
},
@@ -2920,7 +2920,7 @@
"picture_url": null
}
],
- "average_daily_users": 140965,
+ "average_daily_users": 142004,
"categories": {
"android": [
"performance",
@@ -3034,10 +3034,10 @@
"category": "recommended"
},
"ratings": {
- "average": 3.911,
- "bayesian_average": 3.906620181546117,
- "count": 1090,
- "text_count": 390
+ "average": 3.912,
+ "bayesian_average": 3.907620335503252,
+ "count": 1091,
+ "text_count": 391
},
"ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/reviews/",
"requires_payment": false,
@@ -3056,7 +3056,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/versions/",
- "weekly_downloads": 1452
+ "weekly_downloads": 1504
},
"notes": null
}
diff --git a/projects/firefox/config b/projects/firefox/config
index 4faade0d68095b2ad258b44311a5b41a74356326..668642c82a786ef99f105587f636dfbf4e4cc231 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -12,10 +12,10 @@ container:
use_container: 1
var:
- firefox_platform_version: 102.5.0
+ firefox_platform_version: 102.6.0
firefox_version: '[% c("var/firefox_platform_version") %]esr'
- browser_branch: '12.0-2'
- browser_build: 1
+ browser_branch: '12.0-1'
+ browser_build: 2
branding_directory: 'browser/branding/alpha'
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
nightly_updates_osname: '[% c("var/osname") %]'
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 06a0fec8b6fd8251a37c454eddea8bde67582a48..edea386ae6d5d60c6cddb0e813d2d99f9e5e5cfb 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-build[% c("var/browser_build") %]'
tag_gpg_id: 1
git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git
git_submodule: 1
@@ -12,8 +12,9 @@ container:
use_container: 1
var:
- geckoview_version: 102.5.0esr
- torbrowser_branch: 12.0
+ geckoview_version: 102.6.0esr
+ torbrowser_branch: 12.0-1
+ browser_build: 2
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
- build-essential
diff --git a/projects/go/config b/projects/go/config
index 976f5485a3c19b754e32d71a8c87cb5d800e7ea0..4642fe163be2bda878e8109a533278a62fb20763 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 1.19.3
+version: 1.19.4
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
@@ -121,7 +121,7 @@ input_files:
enable: '[% ! c("var/linux") %]'
- URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
name: go
- sha256sum: 18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212
+ sha256sum: eda74db4ac494800a3e66ee784e495bfbb9b8e535df924a8b01b1a8028b7f368
- URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
name: go14
sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/manual/config b/projects/manual/config
index 2b80bd5d411cbebd802f75c6e5f492e947262420..d974308eb553b3c3c8bfd8a0c046655fc09d614e 100644
--- a/projects/manual/config
+++ b/projects/manual/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
# To update, see doc/how-to-update-the-manual.txt
# Remember to update also the package's hash, with the version!
-version: 58611
+version: 59571
filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz'
container:
use_container: 1
@@ -17,8 +17,8 @@ var:
input_files:
- project: container-image
- - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip'
+ - URL: 'https://people.torproject.org/~ma1/tbb_files/manual_[% c("version") %].zip'
name: manual
- sha256sum: c5466b54474ca16095f9d22ea7f092941634b50e7c63673853766e26fd53b1c0
+ sha256sum: e4f19badca9207c8249e79b5fdf81363d1964cc84b2875355c9b4478db584224
- filename: packagemanual.py
name: package_script
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index d8cf1102aea957ed12e516d7529e4c4caedc2409..f9c6e27d0b5e3a4f10985238c5e208c51b948c84 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_url: https://gitlab.torproject.org/tpo/translation.git
# We need to bump the commit before releasing but just pointing to a branch
# might cause too much rebuidling of the Firefox part.
-git_hash: 5c29c501b58ce41df844079e4b841aa475a3d2d4
+git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35
version: '[% c("abbrev") %]'
diff --git a/projects/translation-base-browser-fluent/config b/projects/translation-base-browser-fluent/config
index 9c78413b91936041fb682f5f714df36ea797c0f8..6a721260c93276ab7c3395f80b1f8ff25548ed69 100644
--- a/projects/translation-base-browser-fluent/config
+++ b/projects/translation-base-browser-fluent/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_url: https://gitlab.torproject.org/tpo/translation.git
-git_hash: 0a69485d1b27d6a76ab98c622b09db8b3bca5a3c
+git_hash: e1bb5278668e71317ccbf1fdd21cf25c4d56b95c
version: '[% c("abbrev") %]'
targets:
diff --git a/projects/translation-base-browser/config b/projects/translation-base-browser/config
index 7f371c2a89bbebb210296b2dda8b9bf5caaacc52..cc39069a654f51be76328c74ddd9579b3c87e357 100644
--- a/projects/translation-base-browser/config
+++ b/projects/translation-base-browser/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_url: https://gitlab.torproject.org/tpo/translation.git
-git_hash: 5bcca955007294df0e6e837710e8049b140fc6fd
+git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc
version: '[% c("abbrev") %]'
diff --git a/rbm.conf b/rbm.conf
index 6e8251a56a0fa74b4e192903cb71f189cbed7bdd..59a1e985c1a8a14f9f93cfe8d90c0b62ceddf20d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -71,10 +71,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '12.0'
+ torbrowser_version: '12.0.1'
torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 11.5.8
+ - 12.0
build_mar: 1
# By default, we sort the list of installed packages. This allows sharing
# containers with identical list of packages, even if they are not listed