fixup! Bug 40765: Prepare stable release 12.0.4

projects/android-components/config

 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build5'
+git_hash: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1-build6'
 git_url: https://gitlab.torproject.org/tpo/applications/android-components.git
 tag_gpg_id: 1
 gpg_keyring:

projects/fenix/config

 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build2'
+git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build3'
 git_url: https://gitlab.torproject.org/tpo/applications/fenix.git
 tag_gpg_id: 1
 gpg_keyring:

projects/firefox/config

@@ -15,7 +15,7 @@ var:
   firefox_platform_version: 102.9.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   browser_branch: '12.0-1'
-  browser_build: 1
+  browser_build: 2
   branding_directory: 'browser/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   nightly_updates_osname: '[% c("var/osname") %]'
@@ -65,8 +65,7 @@ steps:
 
 targets:
   basebrowser:
-    # basebrowser tag always has a -build1 suffix
-    git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1'
+    git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build2'
 
   release:
     var:

projects/geckoview/config

@@ -14,7 +14,7 @@ container:
 var:
   geckoview_version: 102.9.0esr
   torbrowser_branch: 12.0-1
-  browser_build: 1
+  browser_build: 2
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
     - build-essential

rbm.conf

@@ -72,7 +72,7 @@ buildconf:
 
 var:
   torbrowser_version: '12.0.4'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 12.0.3
   build_mar: 1