Update tor-browser to v11.0.15 / tor-binary to v0.4.7.8

This commit is contained in:
Christoph Atteneder 2022-07-04 12:04:48 +02:00
parent d627c8fa28
commit 2dafd42639
No known key found for this signature in database
GPG Key ID: CD5DC1C529CDFD3B
3 changed files with 2351 additions and 2847 deletions

View File

@ -69,8 +69,8 @@ configure(subprojects) {
loggingVersion = '1.2' loggingVersion = '1.2'
lombokVersion = '1.18.22' lombokVersion = '1.18.22'
mockitoVersion = '4.0.0' mockitoVersion = '4.0.0'
/* Netlayer version 0.7.3 with Tor browser version 11.0.14 and tor binary version: 0.4.7.7 */ /* Netlayer version 0.7.4 with Tor browser version 11.0.15 and tor binary version: 0.4.7.8 */
netlayerVersion = '6797461310f077bbea4f43a3a509c077b0ed8c34' netlayerVersion = '0858d6dd19ff14486460bb9dbef079e363fc3c47'
protobufVersion = '3.19.1' protobufVersion = '3.19.1'
protocVersion = protobufVersion protocVersion = protobufVersion
pushyVersion = '0.13.2' pushyVersion = '0.13.2'

View File

@ -14,7 +14,6 @@ unpacks the tor browser binaries to extract and repackage the tor binaries thems
Therefore, upgrading tor in Bisq comes down to upgrading these two artefacts. Therefore, upgrading tor in Bisq comes down to upgrading these two artefacts.
## Upgrade steps ## Upgrade steps
@ -74,7 +73,7 @@ next.
### 3. Update `netlayer` ### 3. Update `netlayer`
Create a PR for the `externaltor` branch of [netlayer][1] with the following changes: Create a PR for the `master` branch of [netlayer][1] with the following changes:
- In `netlayer/pom.xml`: - In `netlayer/pom.xml`:
- Update `tor-binary.version` to the `tor-binary` commit ID from above (e.g. `a4b868a`) - Update `tor-binary.version` to the `tor-binary` commit ID from above (e.g. `a4b868a`)
@ -84,13 +83,13 @@ Create a PR for the `externaltor` branch of [netlayer][1] with the following cha
- `netlayer/tor.external/pom.xml` - `netlayer/tor.external/pom.xml`
- `netlayer/tor.native/pom.xml` - `netlayer/tor.native/pom.xml`
Once the PR is merged, make a note of the commit ID in the `externaltor` branch (for example `32779ac`), as it will be Once the PR is merged, make a note of the commit ID in the `master` branch (for example `32779ac`), as it will be
needed next. needed next.
Create a tag for the new artefact version, having the new tor binary version as description, for example: Create a tag for the new artefact version, having the new tor binary version as description, for example:
``` ```
# Create tag locally for new netlayer release, on the externaltor branch # Create tag locally for new netlayer release, on the master branch
git tag -s 0.7.0 -m"tor 0.4.5.6" git tag -s 0.7.0 -m"tor 0.4.5.6"
# Push it to netlayer repo # Push it to netlayer repo
@ -104,7 +103,7 @@ Create a Bisq PR with the following changes:
- In `bisq/build.gradle` update `netlayerVersion` to the `netlayer` commit ID from above - In `bisq/build.gradle` update `netlayerVersion` to the `netlayer` commit ID from above
- Update the gradle dependency checksums - Update the gradle dependency checksums
- See instructions in `bisq/gradle/witness/gradle-witness.gradle` - See instructions in `bisq/gradle/README.md`

File diff suppressed because it is too large Load Diff