Commit 5344bfa8 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Pick up tor-browser -build2 and tag build3

parent c5431b7c

projects/firefox/config

+1 −1
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'

git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'

git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2'

tag_gpg_id: 1

git_url: https://git.torproject.org/tor-browser.git

git_submodule: 1

projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ Tor Browser 10.0 -- September 22 2020 
   * Bug 30682: Disable Intermediate CA Preloading

   * Bug 30812: Exempt about: pages from Resist Fingerprinting

   * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser]

   * Bug 32017: Use ExtensionStorageIDB again

   * Bug 32612: Update MAR_CHANNEL_ID for the alpha

   * Bug 32886: Separate treatment of @media interaction features for desktop and android

   * Bug 33534: Review FF release notes from FF69 to latest (FF78)

rbm.conf

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ buildconf: 


var:

  torbrowser_version: '10.0'

  torbrowser_build: 'build2'

  torbrowser_build: 'build3'

  torbrowser_incremental_from:

    - 9.5.4

  project_name: tor-browser