- tbb-commits - lists.torproject.org

[tor-browser-build/maint-9.0] Picking up 68.8.0esr rc2
by gk＠torproject.org 30 Apr '20

30 Apr '20

commit 545e9783a2faf9d577036ddc4f102c5a52dcb467 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 30 06:08:46 2020 +0000 Picking up 68.8.0esr rc2 --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- rbm.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 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: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index 75efe0d..9d7c3c2 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-build1' +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 git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index e23a15b..88a6565 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0.10' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0.9 project_name: tor-browser

1 0

[tor-browser-spec/master] Bug 33950: Add instructions for rolling back an update
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit c1a8d19ec385b815f54d26638f886588e1854294 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 28 14:56:36 2020 +0200 Bug 33950: Add instructions for rolling back an update --- processes/ReleaseProcess | 3 +- processes/RollingBackUpdate | 71 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 7d731d9..842325c 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -201,7 +201,8 @@ chmod 664 ${TORBROWSER_UPDATE_CHANNEL}/.htaccess chmod 775 ${TORBROWSER_UPDATE_CHANNEL}/ # Rename the update responses directory to .old to make it easier to - # revert in case of problem + # revert in case of problem (see the file RollingBackUpdate for more + # details about this) torsocks ssh staticiforme.torproject.org "rm -rf /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}.old" torsocks ssh staticiforme.torproject.org "mv -v /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL} /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3/${TORBROWSER_UPDATE_CHANNEL}.old" torsocks rsync -avP $TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/aus1-master.torproject.org/htdocs/torbrows… diff --git a/processes/RollingBackUpdate b/processes/RollingBackUpdate new file mode 100644 index 0000000..bfe7471 --- /dev/null +++ b/processes/RollingBackUpdate @@ -0,0 +1,71 @@ +Rolling Back Tor Browser Updates +================================ + +In some cases a critical issue is found shortly after releasing an update. +In those cases rolling back an update to avoid having more users hitting +the issue can be useful. + +There are two separate cases: + - rolling back an update for users of all platforms + - rolling back an update only for users of a specific platform + +Note: this is about rolling back updates for stable/alpha releases. +Rolling back updates on nightly is more difficult. + +In the following instructions we are assuming that we are rolling back +an alpha update. But the same instructions should work for a stable +release too by replacing all instances of "alpha" by "release". +We also assume that we released version 9.5a11 and want to roll back to +version 9.5a10. You will need to replace those versions numbers in the +instructions. + +If you followed the instructions from ReleaseProcess, in the directory +/srv/aus1-master.torproject.org/htdocs/torbrowser/update_3 on staticiforme +you should have renamed the directory alpha to alpha.old. +If you didn't do it, you should get a new copy of the update_responses +directory for the previous release, for instance by running +"make update_responses-alpha" in tor-browser-build, after +checking out the tag from the previous release. + +You should also check that the previous release is still present in +the directory /srv/cdn-master.torproject.org/htdocs/aus1/torbrowser. + + +Rolling back an update for users of all platforms +------------------------------------------------- + +You can roll back the update with the following steps on staticiforme: + + - in /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3, remove + the directory "alpha" and rename "alpha.old" to "alpha". + + - edit the file "alpha/.htaccess" and at the top, after the line + "RewriteEngine On" add a new line: + RewriteRule ^[^/]+/9.5a11/ no-update.xml [last] + With this line we can avoid proposing an update to the previous + version to the users who already updated to the new version. + + - run "static-update-component aus1.torproject.org" + + +Rolling back an update only for users of a specific platform +------------------------------------------------------------ + +In the following instructions, we assume that we want to roll back the +update for users of Windows x86_64 only. In the following instructions, +you should replace WINNT_x86_64-gcc3-x64 with the platform for which +you want to roll back the update (see build_targets in the file +projects/release/update_responses_config.yml in tor-browser-build for +the list of platforms). + +You can roll back the update with the following steps on staticiforme: + + - in /srv/aus1-master.torproject.org/htdocs/torbrowser/update_3, rename + or copy the directory "alpha.old" to "alpha.9.5a10". + + - edit the file "alpha/.htaccess" and at the top, after the line + "RewriteEngine On" add a new line: + RewriteRule ^WINNT_x86_64-gcc3-x64/.* https://aus1.torproject.org/torbrowser/update_3/alpha.95a10/$0 [last] + + - run "static-update-component aus1.torproject.org" +

1 0

[tor-browser-spec/master] Small typo fix
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 99878a95e913e3286f6d756429129cd15ce94791 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:55:34 2020 +0000 Small typo fix --- processes/RollingBackUpdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processes/RollingBackUpdate b/processes/RollingBackUpdate index bfe7471..a1e518b 100644 --- a/processes/RollingBackUpdate +++ b/processes/RollingBackUpdate @@ -16,7 +16,7 @@ In the following instructions we are assuming that we are rolling back an alpha update. But the same instructions should work for a stable release too by replacing all instances of "alpha" by "release". We also assume that we released version 9.5a11 and want to roll back to -version 9.5a10. You will need to replace those versions numbers in the +version 9.5a10. You will need to replace those version numbers in the instructions. If you followed the instructions from ReleaseProcess, in the directory

1 0

[tor-browser-build/master] Bug 33952: Add instructions related to build-sunet-a.torproject.net
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 513da8008078851501da2e4e9c2d91c4fbfdb5bf Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 27 22:59:20 2020 +0200 Bug 33952: Add instructions related to build-sunet-a.torproject.net Add instructions for adding/removing/updating users on build-sunet-a.torproject.net as well as installing new packages. We also update the tbb-team role to make it possible to remove users. While updating the README file we also add a link for more details about setting up a new nightly build machine. --- tools/ansible/README | 38 ++++++++++++++++++++++++-- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 7 +++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/tools/ansible/README b/tools/ansible/README index dc69ad7..6056372 100644 --- a/tools/ansible/README +++ b/tools/ansible/README @@ -1,4 +1,4 @@ -This directory contains some ansible script that we use to setup some +This directory contains some ansible script that we use to set up some machines that we use for Tor Browser development. To deploy some changes you need the ansible package to be installed on @@ -9,7 +9,8 @@ You can then use one of the following makefile targets: ansible-tbb-build: Deploy changes to the machine used by Tor Browser team members to do - some Tor Browser builds. + some Tor Browser builds. See below for more details about adding, + removing and updating users on this machine. fpcentral: Deploy fpcentral to forrestii.torproject.org. To be able to run this @@ -21,4 +22,37 @@ boklm-tbb-nightly-build: anybody else wants to set up their own nightly builds, it is possible to do it by adding a new host to the inventory file and making copies of group_vars/boklm-tbb-nightly/ and boklm-tbb-nightly-build.yml. + For more details, see also this ticket: + https://trac.torproject.org/projects/tor/ticket/33948 + + +Adding, removing, updating users on the Tor Browser team build machine +====================================================================== + +The tbb-build.yml playbook is used to set up the Tor Browser team build +machine (build-sunet-a.torproject.net) + +To add a new user: + + - add the new username to roles/tbb-team/defaults/main.yml + - add the ssh key file to roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To update the ssh key for an existing user: + - update roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To remove a user and their home directory from the build machine: + - in roles/tbb-team/defaults/main.yml, move the user from + tbb_team_members to tbb_team_alums + - remove roles/tbb-team/files/${username}.pub + - run "make ansible-tbb-build" + +To install additional packages you can add them to +roles/tbb-builder/tasks/main.yml if they are necessary to build +Tor Browser, or to roles/useful-packages/tasks/main.yml otherwise. + +If you don't want to apply the changes directly, but first want to check +what would be the changes done by ansible, you can edit the ansible-playbook +command in the Makefile to add the --check argument. diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 4ce9c03..75a1db5 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -8,3 +8,4 @@ tbb_team_members: - mikeperry - pospeselr - sukhbir +tbb_team_alums: [] diff --git a/tools/ansible/roles/tbb-team/tasks/main.yml b/tools/ansible/roles/tbb-team/tasks/main.yml index 5cc5755..8e63416 100644 --- a/tools/ansible/roles/tbb-team/tasks/main.yml +++ b/tools/ansible/roles/tbb-team/tasks/main.yml @@ -13,3 +13,10 @@ state: present key: "{{ lookup('file', item + '.pub') }}" with_items: "{{ tbb_team_members }}" + +- name: Remove tbb-team alums users + user: + name: "{{ item }}" + state: absent + remove: yes + with_items: "{{ tbb_team_alums }}"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33952_v2'
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 6768a86581b63bfa37279d3144e105faaa35e366 Merge: 7464798 513da80 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:17:45 2020 +0000 Merge remote-tracking branch 'boklm/bug_33952_v2' tools/ansible/README | 38 ++++++++++++++++++++++++-- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/tasks/main.yml | 7 +++++ 3 files changed, 44 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Move mcs and brade to alumns build machine-wise
by gk＠torproject.org 29 Apr '20

29 Apr '20

commit 895efbcd312083c6da2fc9f9e1c023441e5e97c0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 29 15:20:54 2020 +0000 Move mcs and brade to alumns build machine-wise --- tools/ansible/roles/tbb-team/defaults/main.yml | 6 +++--- tools/ansible/roles/tbb-team/files/brade.pub | 1 - tools/ansible/roles/tbb-team/files/mcs.pub | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index 75a1db5..879c435 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,11 +1,11 @@ --- tbb_team_members: - boklm - - brade - cohosh - gk - - mcs - mikeperry - pospeselr - sukhbir -tbb_team_alums: [] +tbb_team_alums: + - brade + - mcs diff --git a/tools/ansible/roles/tbb-team/files/brade.pub b/tools/ansible/roles/tbb-team/files/brade.pub deleted file mode 100644 index 0a83b4d..0000000 --- a/tools/ansible/roles/tbb-team/files/brade.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+p9eNuVj59oHkPe/uM+DFTchAxMsm1F6jsMMQqzcNd2sIVAxftMEu8OTM5/rdz+XemevzE+BYHhNUamW/05rur97AYJB7hsOYBtx0g9tGx/2zot72yU38TjmbhWE1FKct+9zc6ZQnYHXLtWBB6k/zJeQH2CvwDLrHsXxfUvOE9lXrcgFy1ugVC96EknBfqz5LTG2dsQhn+nzpEnb3IZYoaRc0h33BVGLkNyFQEtm+7JzylTX6/854kk1BqwZLl03U6++7XA4SjVOYPCM3K1++dJt3CwnARs7mR3t03FFUj0gyRoPuxB6iwPtaCDIDEhSOMmj8hfbFu1N4jm4XY1H3 diff --git a/tools/ansible/roles/tbb-team/files/mcs.pub b/tools/ansible/roles/tbb-team/files/mcs.pub deleted file mode 100644 index af8dd08..0000000 --- a/tools/ansible/roles/tbb-team/files/mcs.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDipHBalbwyEb0AWwbRPa+pxGGSyFTkoOtyn76AqTD6WZIJKBBe4PkkqkJOI7STWxwVkbzTZoC1UyzUCXc3L/bxt85bopAgg0EucM3z3t6XX3kbaDPEGi+mhA4lFYdpJmWe1wbDhiAMYSAONnVcRgmk6bPkgRBWM5zCshOOS5/hs1HW6/zOzgJX6+B7vLYiccHkRj9YeOln+OyR+ko1nFovBFIeDw5DjZqNHki0/hBe1SpaBKCUWHBwkugmvI3Q/VL5pQhWAcMwqEmEcosmX5SPBsAn8217u0mPLcW2cAx30Yj95lfO3LzOV27dnqYfT0IN4gysm2S9Z0mV7yMgSkgV mcs

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohoshtpo/ticket/33576'
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit 7464798ed3a34a2d492c55e34673dbe3d4a134d2 Merge: 4d855e7 be5efcc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 29 14:06:53 2020 +0000 Merge remote-tracking branch 'cohoshtpo/ticket/33576' projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Fix git url for goxxerrors project
by sysrqb＠torproject.org 29 Apr '20

29 Apr '20

commit be5efccdf6aeb316a2b8c9888a942e647c544bc9 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Apr 29 13:47:37 2020 +0000 Fix git url for goxxerrors project --- projects/goxxerrors/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config index 08d6777..6733498 100644 --- a/projects/goxxerrors/config +++ b/projects/goxxerrors/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://golang.org/x/xerrors +git_url: https://go.googlesource.com/xerrors git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

1 0

[tor-browser-build/master] Add GeKo to nightly build emails
by boklm＠torproject.org 29 Apr '20

29 Apr '20

commit 4d855e74585ac099e4c5526c83c04302093305d2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 29 15:02:28 2020 +0200 Add GeKo to nightly build emails --- tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml index 8e4bc05..6addb1d 100644 --- a/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml +++ b/tools/ansible/group_vars/boklm-tbb-nightly/tbb-nightly-build.yml @@ -2,5 +2,5 @@ nightly_build_hostname: f4amtbsowhix7rrf.onion nightly_build_url: 'http://{{ nightly_build_hostname }}' nightly_build_email_from: "'Tor Browser Nightly Builds (boklm) <boklm-tbb-nightly(a)riseup.net>'," -nightly_build_email_to: "[ 'boklm(a)torproject.org', 'sysrqb(a)torproject.org', ]," +nightly_build_email_to: "[ 'boklm(a)torproject.org', 'gk(a)torproject.org', 'sysrqb(a)torproject.org', ]," nightly_build_sign_build: 1

1 0

[tor-browser-build/master] Bug 33573: Update pion-webrtc version to 2.2.3
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 02a73e328b08882cff7a20cedac446aad423de35 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Mar 12 16:28:32 2020 +0000 Bug 33573: Update pion-webrtc version to 2.2.3 --- projects/agouti/config | 17 +++++++++++++++++ projects/goerrors/config | 2 +- projects/goxcrypto/config | 2 +- projects/goxxerrors/config | 17 +++++++++++++++++ projects/pion-datachannel/config | 2 +- projects/pion-dtls/config | 8 +++++++- projects/pion-ice/config | 8 ++++---- projects/pion-rtp/config | 6 +++++- projects/pion-sctp/config | 2 +- projects/pion-sdp/config | 2 +- projects/pion-srtp/config | 5 +---- projects/pion-turn/config | 14 +------------- projects/pion-webrtc/config | 8 ++++---- projects/testify/config | 2 +- 14 files changed, 62 insertions(+), 33 deletions(-) diff --git a/projects/agouti/config b/projects/agouti/config new file mode 100644 index 0000000..086aa86 --- /dev/null +++ b/projects/agouti/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/sclevine/agouti +git_hash: e3f6c97a4077ad821daab49db8172cf9f6690faf #v3.0.0 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: github.com/sclevine/agouti + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/goerrors/config b/projects/goerrors/config index c9a34e8..626f7d5 100644 --- a/projects/goerrors/config +++ b/projects/goerrors/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pkg/errors -git_hash: ba968bfe8b2f7e042a574c888954fccecfa385b4 # v0.8.1 +git_hash: 614d223910a179a466c1767a985424175c39b465 # v0.9.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 698f94b..1e23034 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: ff983b9c42bc9fbf91556e191cc8efb585c16908 +git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/goxxerrors/config b/projects/goxxerrors/config new file mode 100644 index 0000000..08d6777 --- /dev/null +++ b/projects/goxxerrors/config @@ -0,0 +1,17 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://golang.org/x/xerrors +git_hash: 9bdfabe68543c54f90421aeb9a60ef8061b5b544 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + container: + use_container: 1 + go_lib: golang.org/x/xerrors + +input_files: + - project: container-image + - name: go + project: go diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index b8a521c..c36a0bb 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: 58b4a51d48764c2cb19e0c7ced43640a87857c69 # v1.4.13 +git_hash: a245abfdaab4a9406cc2e18ad303b5d0717d43af # v1.4.16 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 244c764..0ee19b4 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/dtls -git_hash: 8748e4ac8bf7960bbf399e6f23a9bf4dd30d4e92 # v2.0.0-rc.3 +git_hash: 147774b64b6a8ac9bd0af5a7efff69ee8e0fd4a8 # v2.0.0-rc.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,6 +12,8 @@ var: go_lib: github.com/pion/dtls go_lib_deps: - goxcrypto + - goxnet + - goxxerrors - pion-logging - pion-transport @@ -21,6 +23,10 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: goxxerrors + project: goxxerrors - name: pion-logging project: pion-logging - name: pion-transport diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 56d0a03..042c014 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 57e7b93a4bac70ee2fd3b38cc2fdf3c6d586ed27 # v0.7.6 +git_hash: 5b6a2756ccaa173bd14050acf3d6e5d5d371bae8 # v0.7.10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,7 @@ var: go_lib: github.com/pion/ice go_lib_deps: - goxnet - - goxsys + - pion-dtls - pion-logging - pion-mdns - pion-stun @@ -26,8 +26,8 @@ input_files: project: go - name: goxnet project: goxnet - - name: goxsys - project: goxsys + - name: pion-dtls + project: pion-dtls - name: pion-logging project: pion-logging - name: pion-mdns diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 5e63b29..b926612 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: 94055aff4ae00d46f218eab6949fa713d48306af # v1.1.4 +git_hash: f7a712d0fb41baeacb3e2ef9ed68ed1aa42afb82 # v1.3.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -10,8 +10,12 @@ var: container: use_container: 1 go_lib: github.com/pion/rtp + go_lib_deps: + - testify input_files: - project: container-image - name: go project: go + - name: testify + project: testify diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index a81911c..89da952 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: ced24b2276cf7991920a301ce5f0735cabafaf3e # v1.7.3 +git_hash: 9e890a28db4990b61ba414e35f79108c19e0a7db # v1.7.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 1a865d4..ed2dbdc 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 9b824fbb8047370a0073ef4b9ebae356e7536502 # v2.3.1 +git_hash: 06fd9e503a8f545f663a757afb09b1e1833c7b2d # v2.3.4 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index eac420c..310cf75 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp -git_hash: 0741c018e441a3502045133280347b9deba1e9d8 # v1.2.6 +git_hash: 57349fe0710b65080a26d8855aa18689364560c3 # v1.2.7 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -12,7 +12,6 @@ var: go_lib: github.com/pion/srtp go_lib_deps: - go-spew - - goerrors - pion-logging - pion-rtcp - pion-rtp @@ -25,8 +24,6 @@ input_files: project: go - name: go-spew project: go-spew - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-rtcp diff --git a/projects/pion-turn/config b/projects/pion-turn/config index 2cbef46..44d81c0 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: bac88c5c692a9826c9703b2950dc52093ae1779a # v1.4.0 +git_hash: b54907e0b25fb5eea5d860ac61f1bf41ea8a6b01 # v2.0.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,32 +11,20 @@ var: use_container: 1 go_lib: github.com/pion/turn go_lib_deps: - - go-spew - - gocheck - - goerrors - pion-logging - pion-stun - pion-transport - - pretty - testify input_files: - project: container-image - name: go project: go - - name: go-spew - project: go-spew - - name: gocheck - project: gocheck - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-stun project: pion-stun - name: pion-transport project: pion-transport - - name: pretty - project: pretty - name: testify project: testify diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index c27a3df..f4bde82 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 77c6e3b827e40175572fcf2894bb81ab1e8fd2c9 # v2.1.18 +git_hash: 1f448413f22d6c32d690db594748d8ad5d3812f5 # v2.2.3 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/webrtc go_lib_deps: - - goxcrypto + - agouti - pion-datachannel - pion-dtls - pion-ice @@ -28,8 +28,8 @@ input_files: - project: container-image - name: go project: go - - name: goxcrypto - project: goxcrypto + - name: agouti + project: agouti - name: pion-datachannel project: pion-datachannel - name: pion-dtls diff --git a/projects/testify/config b/projects/testify/config index 9b20867..bbb82c3 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify -git_hash: 221dbe5ed46703ee255b1da0dec05086f5035f62 # v1.4.0 +git_hash: 3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9 # v1.5.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]'

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 0052c74b743756dafa4f3614f559dd8f8d1645c2 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Apr 28 18:25:36 2020 +0200 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index 87954461bab1..60c3b5fca282 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -16,9 +16,9 @@ const SECUREDROP_TOR_ONION_CHANNEL = { kty: "RSA", e: "AQAB", n: - "y0iWTVev1uYDVhLdc5uSHWke-9JlbxzqIsGkS95Pk5NsxdlkdbHpqaPr-5xL5FspX8QGo3HAT5hrUcPV_kz8x-HwGEm2-p9BQ6-yEPtr5QXQGGzNoizmj7HH-b0y5qx8iUFwAJ__PJWK4IwSgjIQqHMjmkOLc9N4bmRPULi6ZZMb-97FdeZsh34dVy2tpIzZaijRfRQSfeZkwRXZzOY-siGfOAzY_UcrHFli5zroTZAyDaetFm1z2-TdFLOvN8fi0o3mBbCB9SqhOUImPwSTNWTp2D6bHhI91mt7gr6fLnzHMGrTMh2DQ4vjt_98pe7WTUzuRCLa9Awb6JJgbYA4ySV1akAU0_iq6oCAE9PZbUgUw9UAH1ctRFml87F3HORUMMj5ZCLwRIrEXqrCJbV4f-Ius-ZO2wwlYTsEv8TmUzISpMwVjGOIpXwFIb65R_EX3_vIopauSoyZkvk3klly0Qe6KTy_gg1CZ_h2ZXPpLMwqlfFTDBPv2q8gyuzgkYXQes3FX-PbJ9Dsl5QO4icuEjV2NQ7iPwwIPAtj9cpqCD8-p9TqTKaZjOFC9-ryJpWsivGCbvN2JotmJ5Ax9rmnAMvQM09muCetFj_ZIgllcpeahaw6gxVXlSYIhb0J9V878KNuRJ2yPJFlBmgpFexvCcz8Jqs6JUfIrmUAGUXG9nE", + "p10BbUVc5Xj2S_-MH3bACNBaISo_r9e3PVPyTTjsGsdg2qSXvqUO42fBtpFAy0zUzIGS83v4JjiRdvKJaZTIvbC8AcpymzdsTqujMm8RPTSy3hO_8mXzGa4DEsIB1uNLnUWRBKXvSGCmT9kFyxhTpkYqokNBzafVihTU34tN2Md1xFHnmZGqfYtPtbJLWAa5Z1M11EyR4lIyUxIiPTV9t1XstDbWr3iS83REJrGEFmjG1-BAgx8_lDUTa41799N2yYEhgZud7bL0M3ei8s5OERjiion5uANkUV3-s2QqUZjiVA-XR_HizXjciaUWNd683KqekpNOZ_0STh_UGwpcwU-KwG07QyiCrLrRpz8S_vH8CqGrrcWY3GSzYe9dp34jJdO65oA-G8tK6fMXtvTCFDZI6oNNaXJH71F5J0YbqO2ZqwKYc2WSi0gKVl2wd9roOVjaBmkJqvocntYuNM7t38fDEWHn5KUkmrTbiG68Cy56tDUfpKl3D9Uj4LaMvxJ1tKGvzQ4k_60odT7gIxu6DqYjXUHZpwPsSGBq3njaD7boe4CUXF2K7ViOc87BsKxRNCzDD8OklRjjXzOTOBH3PqFJ93CJ-4ECE5t9STU20aZ8E-2zKB8vjKyCySE4-kcIvBBsnkwVaJTPy9Ft1qYybo-soXEWVEZATANNWklBt8k", }, - update_path_prefix: "https://redshiftzero.github.io/securedrop-httpse/", + update_path_prefix: "https://securedrop.org/https-everywhere/", scope: "^https?:\\/\\/[a-z0-9-]+(?:\\.[a-z0-9-]+)*\\.securedrop\\.tor\\.onion\\/", replaces_default_rulesets: false,

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Revert "Bug 30575: Don't allow enterprise policies in Tor Browser"
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 7d0d47db46531a32c88db85323cd771761b8bb5d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 15 14:09:53 2020 -0400 Revert "Bug 30575: Don't allow enterprise policies in Tor Browser" This reverts commit d362cff17d44a82534ea553cbf50fa76906cc218. --- .../enterprisepolicies/EnterprisePolicies.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index dd43d31cb3b0..db77b4717736 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -88,9 +88,25 @@ EnterprisePoliciesManager.prototype = { ), _initialize() { - // We don't want to have any enterprise policies in Tor Browser enabled as - // those can affect proxy settings etc. See: e.g. #30575. - this.status = Ci.nsIEnterprisePolicies.INACTIVE; + let provider = this._chooseProvider(); + + if (!provider) { + this.status = Ci.nsIEnterprisePolicies.INACTIVE; + return; + } + + if (provider.failed) { + this.status = Ci.nsIEnterprisePolicies.FAILED; + return; + } + + this.status = Ci.nsIEnterprisePolicies.ACTIVE; + this._parsedPolicies = {}; + Services.telemetry.scalarSet( + "policies.count", + Object.keys(provider.policies).length + ); + this._activatePolicies(provider.policies); }, _chooseProvider() {

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f5bf259fa2f16c68f3dc12bf9e6d28f43ff8d7e1 Merge: f81583b0d6d7 0052c74b7437 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:42:31 2020 +0000 Merge remote-tracking branch 'acatgh/34032' into tor-browser-68.7.0esr-9.5-1 browser/components/onionservices/HttpsEverywhereControl.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f81583b0d6d7eefd4b7384e8ee95d528ea4fb303 Merge: 5a8128b566fa e577d655d204 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:04:14 2020 +0000 Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1 .../enterprisepolicies/EnterprisePolicies.js | 32 ++++++++++++++++++++-- toolkit/components/enterprisepolicies/moz.build | 4 ++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-)

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] Bug 32418: Allow updates to be disabled via an enterprise policy.
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit e577d655d2044e3b6636b0bccfbb5bd776148582 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Apr 16 17:07:09 2020 -0400 Bug 32418: Allow updates to be disabled via an enterprise policy. Restrict the Enterprise Policies mechanism to only consult a policies.json file (avoiding the Windows Registry and macOS's file system attributes). Add a few disabledByPolicy() checks to the update service to avoid extraneous (and potentially confusing) log messages when updates are disabled by policy. Sample content for distribution/policies.json: { "policies": { "DisableAppUpdate": true } } --- .../enterprisepolicies/EnterprisePolicies.js | 10 ++++++++++ toolkit/components/enterprisepolicies/moz.build | 4 +++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/toolkit/components/enterprisepolicies/EnterprisePolicies.js b/toolkit/components/enterprisepolicies/EnterprisePolicies.js index db77b4717736..bc0171867dfa 100644 --- a/toolkit/components/enterprisepolicies/EnterprisePolicies.js +++ b/toolkit/components/enterprisepolicies/EnterprisePolicies.js @@ -2,6 +2,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// To avoid accessing the Windows Registry or macOS' file system attributes, +// Tor Browser only supports policies.json. +#define JSON_POLICIES_ONLY MOZ_PROXY_BYPASS_PROTECTION + const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); @@ -11,9 +15,11 @@ const { AppConstants } = ChromeUtils.import( ); XPCOMUtils.defineLazyModuleGetters(this, { +#ifndef JSON_POLICIES_ONLY WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm", macOSPoliciesParser: "resource://gre/modules/policies/macOSPoliciesParser.jsm", +#endif Policies: "resource:///modules/policies/Policies.jsm", JsonSchemaValidator: "resource://gre/modules/components-utils/JsonSchemaValidator.jsm", @@ -111,6 +117,7 @@ EnterprisePoliciesManager.prototype = { _chooseProvider() { let provider = null; +#ifndef JSON_POLICIES_ONLY if (AppConstants.platform == "win") { provider = new WindowsGPOPoliciesProvider(); } else if (AppConstants.platform == "macosx") { @@ -119,6 +126,7 @@ EnterprisePoliciesManager.prototype = { if (provider && provider.hasPolicies) { return provider; } +#endif provider = new JSONPoliciesProvider(); if (provider.hasPolicies) { @@ -547,6 +555,7 @@ class JSONPoliciesProvider { } } +#ifndef JSON_POLICIES_ONLY class WindowsGPOPoliciesProvider { constructor() { this._policies = null; @@ -608,6 +617,7 @@ class macOSPoliciesProvider { return this._failed; } } +#endif var components = [EnterprisePoliciesManager]; this.NSGetFactory = XPCOMUtils.generateNSGetFactory(components); diff --git a/toolkit/components/enterprisepolicies/moz.build b/toolkit/components/enterprisepolicies/moz.build index 8f7d7d8cfed7..7528f569bb3e 100644 --- a/toolkit/components/enterprisepolicies/moz.build +++ b/toolkit/components/enterprisepolicies/moz.build @@ -19,10 +19,12 @@ TEST_DIRS += [ if CONFIG['MOZ_WIDGET_TOOLKIT'] != "android": EXTRA_COMPONENTS += [ - 'EnterprisePolicies.js', 'EnterprisePolicies.manifest', 'EnterprisePoliciesContent.js', ] + EXTRA_PP_COMPONENTS += [ + 'EnterprisePolicies.js', + ] if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': EXTRA_JS_MODULES.policies += [ diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 282e1aecc5e8..5fbcc1536540 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -2772,6 +2772,10 @@ UpdateService.prototype = { _checkForBackgroundUpdates: function AUS__checkForBackgroundUpdates( isNotify ) { + if (this.disabledByPolicy) { + return; + } + this._isNotify = isNotify; // Histogram IDs: @@ -3293,6 +3297,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canApplyUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canApplyUpdates - unable to apply updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanApplyUpdates() && hasUpdateMutex(); }, @@ -3300,6 +3312,14 @@ UpdateService.prototype = { * See nsIUpdateService.idl */ get canStageUpdates() { + if (this.disabledByPolicy) { + LOG( + "UpdateService.canStageUpdates - unable to stage updates, " + + "the option has been disabled by the administrator." + ); + return false; + } + return getCanStageUpdates(); },

1 0

[tor-browser-build/maint-9.0] Openssl version bump is only on Win/macOS/Linux
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit ccef18adc1cae3dc652c0b617d6db1d0b1df6631 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 18:36:23 2020 +0000 Openssl version bump is only on Win/macOS/Linux --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6f66cad..18c2c76 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.10 -- May 5 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Windows + OS X + Linux * Bug 34017: Bump openssl version to 1.1.1g Tor Browser 9.0.9 -- April 7 2020

1 0

[tor-browser-build/maint-9.0] Bug 34017 - Bump openssl version to 1.1.1g
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit b92fb2a97d0c15db625d979b7d24df628dad1477 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 17:19:41 2020 +0000 Bug 34017 - Bump openssl version to 1.1.1g --- projects/openssl/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 8ee3b69..f5f16b0 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1f +version: 1.1.1g filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -28,6 +28,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 + sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b0b7a8c..6f66cad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.10 -- May 5 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Bug 34017: Bump openssl version to 1.1.1g Tor Browser 9.0.9 -- April 7 2020 * All Platforms

1 0

[tor-browser-build/maint-9.0] Release preparations for 9.0.10
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit 36455baf5bc29c3f256a055cdac0a83563e5c0fa Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 15:40:45 2020 +0000 Release preparations for 9.0.10 Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ projects/tor-browser/config | 4 ++-- rbm.conf | 5 ++--- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 2d55896..34d6fad 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: build3 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index b2d33a8..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build3 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 8ee8817..75efe0d 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # 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") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.7.0 + firefox_platform_version: 68.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.0 torbrowser_update_channel: alpha diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7e24574..b0b7a8c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 9.0.10 -- May 5 2020 + * All Platforms + * Update Firefox to 68.8.0esr + * Bump NoScript to 11.0.25 + Tor Browser 9.0.9 -- April 7 2020 * All Platforms * Update Firefox to 68.7.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 6f2f436..22d0bb8 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705 + sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/rbm.conf b/rbm.conf index 5b7db99..e23a15b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.0.9' + torbrowser_version: '9.0.10' torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.0.7 - - 9.0.8 + - 9.0.9 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gktpo/bug_32027_v4'
by sysrqb＠torproject.org 27 Apr '20

27 Apr '20

commit 30bdc472d4d2b222b9435c4a1c728ab74ff96365 Merge: ea9ec4f 260a844 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Apr 27 22:04:06 2020 +0000 Merge remote-tracking branch 'gktpo/bug_32027_v4' .../go/0001-Use-fixed-go-build-tmp-directory.patch | 22 ++++----- .../90a3ce02dc25adcf1598faf11a66b151ada3f637.patch | 57 ---------------------- projects/go/build | 2 - projects/go/config | 12 +++-- projects/obfs4/build | 7 +-- projects/snowflake/build | 4 -- 6 files changed, 23 insertions(+), 81 deletions(-)

1 0

[tor-browser-build/master] Bug 32027: Bump Go to 1.13.10
by sysrqb＠torproject.org 27 Apr '20

27 Apr '20

commit 260a8442b8b34ace8920c93b3e92cbe3e06a0c7f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Apr 18 08:04:50 2020 +0000 Bug 32027: Bump Go to 1.13.10 Patch based on dcf's GO111MODULE idea as outlined in #32027. Thanks! --- .../go/0001-Use-fixed-go-build-tmp-directory.patch | 22 ++++----- .../90a3ce02dc25adcf1598faf11a66b151ada3f637.patch | 57 ---------------------- projects/go/build | 2 - projects/go/config | 12 +++-- projects/obfs4/build | 7 +-- projects/snowflake/build | 4 -- 6 files changed, 23 insertions(+), 81 deletions(-) diff --git a/projects/go/0001-Use-fixed-go-build-tmp-directory.patch b/projects/go/0001-Use-fixed-go-build-tmp-directory.patch index a10e059..022aa23 100644 --- a/projects/go/0001-Use-fixed-go-build-tmp-directory.patch +++ b/projects/go/0001-Use-fixed-go-build-tmp-directory.patch @@ -1,33 +1,33 @@ -From 44e3391a5a3d9a2c4b57f78e43414465ab84681e Mon Sep 17 00:00:00 2001 -From: Nicolas Vigier <boklm(a)torproject.org> -Date: Thu, 27 Jun 2019 19:21:05 +0200 +From 958f724b1b434702c3d44ceaca646791674d07b1 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Fri, 17 Apr 2020 10:24:23 +0000 Subject: [PATCH] Use fixed go-build tmp directory Use fixed go-build tmp directory, when the directory does not exist, in order to avoid some reproducibility issues where build directory gets embedded in generated binaries. ---- - src/cmd/go/internal/work/action.go | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cmd/go/internal/work/action.go b/src/cmd/go/internal/work/action.go -index 1f91046eb1..ba74b26a38 100644 +index 33b7818fb2..5e369d0f53 100644 --- a/src/cmd/go/internal/work/action.go +++ b/src/cmd/go/internal/work/action.go -@@ -224,9 +224,13 @@ func (b *Builder) Init() { +@@ -249,9 +249,13 @@ func (b *Builder) Init() { if cfg.BuildN { b.WorkDir = "$WORK" } else { -- tmp, err := ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") +- tmp, err := ioutil.TempDir(cfg.Getenv("GOTMPDIR"), "go-build") - if err != nil { - base.Fatalf("go: creating work dir: %v", err) -+ tmp := filepath.Join(os.Getenv("GOTMPDIR"), "go-build-workdir") ++ tmp := filepath.Join(cfg.Getenv("GOTMPDIR"), "go-build-workdir") + _, err := os.Stat(tmp) + if !os.IsNotExist(err) { -+ tmp, err = ioutil.TempDir(os.Getenv("GOTMPDIR"), "go-build") ++ tmp, err = ioutil.TempDir(cfg.Getenv("GOTMPDIR"), "go-build") + if err != nil { + base.Fatalf("go: creating work dir: %v", err) + } } if !filepath.IsAbs(tmp) { abs, err := filepath.Abs(tmp) +-- +2.26.1 + diff --git a/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch b/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch deleted file mode 100644 index dc66809..0000000 --- a/projects/go/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 90a3ce02dc25adcf1598faf11a66b151ada3f637 Mon Sep 17 00:00:00 2001 -From: Elias Naur <mail(a)eliasnaur.com> -Date: Wed, 27 Mar 2019 14:25:24 +0100 -Subject: [PATCH] cmd/link/internal/ld: skip TLS section on Android - -We don't use the TLS section on android, and dropping it avoids -complaints about underalignment from the Android Q linker. - -Updates #29674 - -Change-Id: I91dabf2a58e6eb1783872639a6a144858db09cef -Reviewed-on: https://go-review.googlesource.com/c/go/+/169618 -Reviewed-by: Ian Lance Taylor <iant(a)golang.org> ---- - src/cmd/link/internal/ld/lib.go | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) - -diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go -index 1d44c0eb18b..b331e39fe3e 100644 ---- a/src/cmd/link/internal/ld/lib.go -+++ b/src/cmd/link/internal/ld/lib.go -@@ -453,18 +453,23 @@ func (ctxt *Link) loadlib() { - } - } - -- tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0) -- -- // runtime.tlsg is used for external linking on platforms that do not define -- // a variable to hold g in assembly (currently only intel). -- if tlsg.Type == 0 { -- tlsg.Type = sym.STLSBSS -- tlsg.Size = int64(ctxt.Arch.PtrSize) -- } else if tlsg.Type != sym.SDYNIMPORT { -- Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) -- } -- tlsg.Attr |= sym.AttrReachable -- ctxt.Tlsg = tlsg -+ // The Android Q linker started to complain about underalignment of the our TLS -+ // section. We don't actually use the section on android, so dont't -+ // generate it. -+ if objabi.GOOS != "android" { -+ tlsg := ctxt.Syms.Lookup("runtime.tlsg", 0) -+ -+ // runtime.tlsg is used for external linking on platforms that do not define -+ // a variable to hold g in assembly (currently only intel). -+ if tlsg.Type == 0 { -+ tlsg.Type = sym.STLSBSS -+ tlsg.Size = int64(ctxt.Arch.PtrSize) -+ } else if tlsg.Type != sym.SDYNIMPORT { -+ Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) -+ } -+ tlsg.Attr |= sym.AttrReachable -+ ctxt.Tlsg = tlsg -+ } - - var moduledata *sym.Symbol - if ctxt.BuildMode == BuildModePlugin { diff --git a/projects/go/build b/projects/go/build index 06af067..02fba2b 100644 --- a/projects/go/build +++ b/projects/go/build @@ -68,8 +68,6 @@ cd /var/tmp/dist/go/src CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/android") -%] patch -p2 < $rootdir/0001-Use-fixed-go-build-tmp-directory.patch - # Obfs4 breaks on Android Q without this patch, see: #32303 - patch -p2 < $rootdir/90a3ce02dc25adcf1598faf11a66b151ada3f637.patch CGO_ENABLED=1 CC_FOR_TARGET=[% c("var/CC") %] CGO_CFLAGS='-D__ANDROID_API__=[% c("var/android_min_api") %]' CC= CFLAGS= LDFLAGS= ./make.bash [% END -%] diff --git a/projects/go/config b/projects/go/config index 371f8c2..509c6da 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.12.13 +version: 1.13.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -17,6 +17,9 @@ var: export GOOS=[% c("var/GOOS") %] export GOARCH=[% c("var/GOARCH") %] [% END -%] + # Run in GOPATH mode: https://golang.org/cmd/go/#hdr-Module_support. (see: + # #32027) + export GO111MODULE=off export GOPATH=/var/tmp/dist/gopath export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" [% IF c("var/linux") -%] @@ -50,6 +53,9 @@ var: do patch -p1 < $p done + # Run in GOPATH mode: https://golang.org/cmd/go/#hdr-Module_support. (see: + # #32027) + export GO111MODULE=off [% IF c("var/build_go_lib_pre"); GET c("var/build_go_lib_pre"); END; -%] [% IF c("var/go_lib_install") -%] [% FOREACH inst IN c("var/go_lib_install") %] @@ -112,11 +118,9 @@ input_files: enable: '[% ! c("var/linux") %]' - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' name: go - sha256sum: 5383d3b8db4baa48284ffcb14606d9cad6f03e9db843fa6d835b94d63cccf5a7 + sha256sum: eb9ccc8bf59ed068e7eff73e154e4f5ee7eec0a47a610fb864e3332a2fdc8b8c - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 - filename: 0001-Use-fixed-go-build-tmp-directory.patch enable: '[% c("var/android") %]' - - filename: 90a3ce02dc25adcf1598faf11a66b151ada3f637.patch - enable: '[% c("var/android") %]' diff --git a/projects/obfs4/build b/projects/obfs4/build index 53b83df..47c7228 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -7,6 +7,9 @@ mkdir -p $PTDIR [% IF c("var/android") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 [% END -%] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] @@ -22,11 +25,9 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -# Remove go.mod and go.sum files until we can build using Go module -# versioning (see bug 28325). -rm -f go.mod go.sum mkdir -p "$GOPATH/src/gitlab.com/yawning" ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" + cd obfs4proxy go build -ldflags '-s' cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR diff --git a/projects/snowflake/build b/projects/snowflake/build index fe74e84..1aede45 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -15,10 +15,6 @@ cd /var/tmp/build/[% project %]-[% c('version') %] mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" - -# Remove go.mod and go.sum files until we can build using Go module versioning -rm -f go.mod go.sum - # Fix gopath location of versioned dependencies ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2"

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 27 Apr '20

27 Apr '20

commit 5a8128b566fab32fa2d97fe7a1a99e761afe77b0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 21 15:02:17 2020 -0400 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/base/content/aboutDialog.xul | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 3c76076c0e8f..d21a24adc499 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -140,11 +140,11 @@ </description> <description class="text-blurb" id="helpDesc"> &help.start; - <label is="text-link" href="https://www.torproject.org/donate/donate.html.en"> + <label is="text-link" href="https://donate.torproject.org/"> &help.donateLink; </label> &help.or; - <label is="text-link" href="https://www.torproject.org/getinvolved/volunteer.html.en"> + <label is="text-link" href="https://community.torproject.org/"> &help.getInvolvedLink; </label>&help.end; </description> @@ -153,8 +153,8 @@ </hbox> <vbox id="bottomBox"> <hbox id="newBottom" pack="center" position="1"> - <label is="text-link" class="bottom-link" href="https://www.torproject.org/docs/faq.html.en">&bottomLinks.questions;</label> - <label is="text-link" class="bottom-link" href="https://www.torproject.org/getinvolved/relays">&bottomLinks.grow;</label> + <label is="text-link" class="bottom-link" href="https://support.torproject.org/">&bottomLinks.questions;</label> + <label is="text-link" class="bottom-link" href="https://community.torproject.org/relay/">&bottomLinks.grow;</label> <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license">&bottomLinks.license;</label> </hbox> <description id="trademark" data-l10n-id="trademarkInfo"></description>

1 0

[tor-browser-build/master] Pick up rbm changes for #33993
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit ea9ec4f818092b1f35bc4884f7b077cbe915c907 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 18:29:35 2020 +0000 Pick up rbm changes for #33993 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 18b396f..5f8c0ac 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 18b396fb08ee9ee9311de7b8224197282f0935fe +Subproject commit 5f8c0ac72abfa72cc80d2ff24627c3e3f8db963f

1 0

[rbm/master] Bug 33993: Check type of target, target_prepend, target_append
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 5f8c0ac72abfa72cc80d2ff24627c3e3f8db963f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Apr 25 12:46:22 2020 +0200 Bug 33993: Check type of target, target_prepend, target_append Exit with an error message if target, target_prepend or target_append defined in input_files is not an array. --- lib/RBM.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 375648f..7cc9e24 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -811,19 +811,24 @@ sub input_files { if ($input_file->{target} || $input_file->{target_append} || $input_file->{target_prepend}) { $input_file = { %$input_file }; - if (ref $input_file->{target} eq 'ARRAY') { + foreach my $t (qw/target target_append target_prepend/) { + if ($input_file->{$t} && ref $input_file->{$t} ne 'ARRAY') { + exit_error("$t should be an ARRAY:\n" . pp($input_file)); + } + } + if ($input_file->{target}) { $input_file->{target} = process_template_opt($project, $input_file->{target}, $options); } else { $input_file->{target} = $config->{run}{target}; } - if (ref $input_file->{target_prepend} eq 'ARRAY') { + if ($input_file->{target_prepend}) { $input_file->{target} = [ @{ process_template_opt($project, $input_file->{target_prepend}, $options) }, @{$input_file->{target}} ]; } - if (ref $input_file->{target_append} eq 'ARRAY') { + if ($input_file->{target_append}) { $input_file->{target} = [ @{$input_file->{target}}, @{ process_template_opt($project, $input_file->{target_append},

1 0

[tor-browser-build/master] Bug 33987: Make var/build_id_txt work in non-build steps
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 32e6bcd3b6db11313be8bfdce475555bbf72138b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 24 15:40:53 2020 +0200 Bug 33987: Make var/build_id_txt work in non-build steps --- rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 94f9fcc..819a257 100644 --- a/rbm.conf +++ b/rbm.conf @@ -47,7 +47,8 @@ var: [% END -%] input_files: [% c("input_files_id") %] build: - [% c("build", { filename => 'f', output_dir => '/out', norec => {} }) %] + [% SET step = c("step") -%] + [% c(step, { filename => 'f', output_dir => '/out', norec => {} }) %] container: dir: '[% c("rbm_tmp_dir") %]/rbm-containers/[% sha256(c("build_id")) %]' user: rbm

1 0

[tor-browser-build/master] Bump rbm commit to pick up fix for #33990
by gk＠torproject.org 27 Apr '20

27 Apr '20

commit 824287778856704d2b97ba871d9d5ed4c6bd9e04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 27 11:20:14 2020 +0000 Bump rbm commit to pick up fix for #33990 --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index e4f12ab..18b396f 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit e4f12abe9ed81050994b5345c21b988005259396 +Subproject commit 18b396fb08ee9ee9311de7b8224197282f0935fe

1 0