commit 956ddcebd5f193aef83e1762c2e89c1b57d2e8c7 Author: Matthew Finkel sysrqb@torproject.org Date: Mon Dec 7 22:36:24 2020 +0000

Tag -build2 --- projects/obfs4/build | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/obfs4/build b/projects/obfs4/build index 4840edf..c0437fc 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -24,12 +24,12 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] +patch -p1 < $rootdir/update_azure_hpkp.patch

mkdir -p "$GOPATH/src/gitlab.com/yawning" ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"

cd obfs4proxy -patch -p1 < $rootdir/update_azure_hpkp.patch go build -ldflags '-s' cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR

diff --git a/rbm.conf b/rbm.conf index a549fc4..9e1db9a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '10.0.6' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0.5 project_name: tor-browser