From 02f5225584138d1625b275067f61e92156f1a483 Mon Sep 17 00:00:00 2001
From: cd2357 <cd2357@users.noreply.github.com>
Date: Tue, 6 Oct 2020 16:08:53 +0200
Subject: [PATCH] Bump netlayer to use tor binary from tor browser v9.5.4

Upgrade netlayer to a version that uses tor binaries extracted from the latest tor-browser v9.5.4.

The tor binaries in tor-browser v9.5.4 are the same version as from tor-browser 9.5.3 (namely tor v0.4.3.6). However, they were extracted from tor-browser binaries with matching SHA-256 hashes to the official browser binaries in https://dist.torproject.org/torbrowser/9.5.4/sha256sums-signed-build.txt
---
 build.gradle                         |  6 +++---
 gradle/witness/gradle-witness.gradle | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2d5df8f3611..08c2c7d1976 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,7 @@ configure(subprojects) {
         loggingVersion = '1.2'
         lombokVersion = '1.18.2'
         mockitoVersion = '3.0.0'
-        netlayerVersion = '0.6.8'
+        netlayerVersion = 'cdbe476'
         protobufVersion = '3.10.0'
         protocVersion = protobufVersion
         pushyVersion = '0.13.2'
@@ -271,10 +271,10 @@ configure(project(':common')) {
 configure(project(':p2p')) {
     dependencies {
         compile project(':common')
-        compile("com.github.JesusMcCloud.netlayer:tor.native:$netlayerVersion") {
+        compile("com.github.cd2357.netlayer:tor.native:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
-        compile("com.github.JesusMcCloud.netlayer:tor.external:$netlayerVersion") {
+        compile("com.github.cd2357.netlayer:tor.external:$netlayerVersion") {
             exclude(module: 'slf4j-api')
         }
         implementation("org.apache.httpcomponents:httpclient:$httpclientVersion") {
diff --git a/gradle/witness/gradle-witness.gradle b/gradle/witness/gradle-witness.gradle
index 1c3c1ae6349..c59412bd7af 100644
--- a/gradle/witness/gradle-witness.gradle
+++ b/gradle/witness/gradle-witness.gradle
@@ -19,16 +19,16 @@ dependencyVerification {
         'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
         'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
         'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
-        'com.github.JesusMcCloud.netlayer:tor.external:1facb63d5f4107a1d4a176a03c149b60eed19a76371b58d1b6aa62ad5cacde3f',
-        'com.github.JesusMcCloud.netlayer:tor.native:88267f1a3b2d1433a77a2fd9dc3a8f1d5cd28fbbefa2e078d83b176cbe91d477',
-        'com.github.JesusMcCloud.netlayer:tor:0eaae7bcea11ef25e4f041e77c237ebc96f120462e64a7818073a88dadf9b805',
-        'com.github.JesusMcCloud.tor-binary:tor-binary-geoip:08a461608990aed2c272121dc835a38687017d3bb172bc181ea0793df7ebb5aa',
-        'com.github.JesusMcCloud.tor-binary:tor-binary-linux32:81fb1e80d191ed9d0a509e514311d21d59c87c6edee6a490975061a18390b10c',
-        'com.github.JesusMcCloud.tor-binary:tor-binary-linux64:7b90b5e8f1cc32d86ed8e2e5b1f57d774bc27bebc679ececdbf1ff0699bd1f4c',
-        'com.github.JesusMcCloud.tor-binary:tor-binary-macos:db5aef1082fdd8afb4f7f21cf0956f46a76e93aad75bed6ed149dd3e3767c0a7',
-        'com.github.JesusMcCloud.tor-binary:tor-binary-windows:1bb83786a71449d8edb152e40ce5efc129eaca6a0900f4912d7555b6df2f52a2',
         'com.github.JesusMcCloud:jtorctl:389d61b1b5a85eb2f23c582c3913ede49f80c9f2b553e4762382c836270e57e5',
         'com.github.bisq-network:bitcoinj:85d609e9bbaa93de0a9ca1ab436f578c14f7cfa1876b50878046d9f624b48a6b',
+        'com.github.cd2357.netlayer:tor.external:2a3c9a168faf98328f1d5839a2adda4169550c1ece33fa654e1e69f2504f67c9',
+        'com.github.cd2357.netlayer:tor.native:0b2c7c811e7f7b9540bf837ec270dd671ab654daac2a19bef46819efbc0620e8',
+        'com.github.cd2357.netlayer:tor:23c45061af4d0e3a30149e33a5fd252bd0ada6302e4db092104d7f2ddc0460f1',
+        'com.github.cd2357.tor-binary:tor-binary-geoip:a73775c8903593b0350315605f12158e9f598231f2200745ab14c3f972735aca',
+        'com.github.cd2357.tor-binary:tor-binary-linux32:b1d69dcecdd7b0e4129c1ab11f35b25921e9b821304f4307f3743d9c092a9aa5',
+        'com.github.cd2357.tor-binary:tor-binary-linux64:5375b9f966a98c0774e90f606234395b13621e15572849d25e955a118a959d19',
+        'com.github.cd2357.tor-binary:tor-binary-macos:56c72a735a1dfb9468cbf3ffca9d781ef1dca016c219db3461e87d33bbc85945',
+        'com.github.cd2357.tor-binary:tor-binary-windows:100474c9dfab327febee9edbd5b5d74e3f8c0351e92608650d40bcf7a4630831',
         'com.github.ravn:jsocks:3c71600af027b2b6d4244e4ad14d98ff2352a379410daebefff5d8cd48d742a4',
         'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6',
         'com.google.android:annotations:ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15',