[tor-commits] [tor-browser-build/maint-10.0-android] Tag -build2

[sysrqb at torproject.org]

commit f2cff2bdabd356bdbd7f7c8183937678955df09f
Author: Matthew Finkel <sysrqb at 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 4300256..bb2982e 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.5a1
   project_name: tor-browser