commit da2bb257968d238a538ebc6ddfb7da2e35041985 Author: Nicolas Vigier boklm@torproject.org Date: Thu Apr 20 09:47:04 2017 +0200

Pick up build3 from Mozilla and bug fixes

tor-browser-bundle.git commit: 421091532d3536893e715f62cab9055cd822b95a --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..39f04cb 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil

var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build3 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

diff --git a/projects/firefox/config b/projects/firefox/config index 14c1cd5..2c74e4b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # 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") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg