Merge branch 'tor-0.4.5.12' into 'main'

Upgrade Tor to 0.4.5.12 and obfs4proxy to 0.0.12

Closes #137

See merge request !97

build.gradle

@@ -2,8 +2,8 @@ buildscript {
     ext.kotlin_version = '1.6.21'
     ext.hilt_version = '2.40'
     ext.nav_version = '2.4.2'
-    ext.tor_version = '0.3.5.15'
-    ext.obfs4_version = '0.0.12-dev-40245c4a'
+    ext.tor_version = '0.4.5.12-2'
+    ext.obfs4_version = '0.0.12'
     ext.junit_version = '5.7.2'
     ext.mockk_version = '1.10.4'
     ext.ktlint_plugin_version = '10.2.1'

mailbox-android/build.gradle

@@ -87,7 +87,7 @@ dependencies {
     implementation "androidx.multidex:multidex:$multidex_version"
 
     tor "org.briarproject:tor-android:$tor_version"
-    tor "org.briarproject:obfs4proxy-android:$obfs4_version@zip"
+    tor "org.briarproject:obfs4proxy-android:$obfs4_version"
 
     testImplementation 'junit:junit:4.13.2'
 

mailbox-android/src/main/res/raw/.gitignore

+*
+!.gitignore
\ No newline at end of file

mailbox-cli/build.gradle

@@ -29,8 +29,8 @@ dependencies {
     def jna_version = '5.8.0'
     implementation "net.java.dev.jna:jna:$jna_version"
     implementation "net.java.dev.jna:jna-platform:$jna_version"
-    tor "org.briarproject:tor:$tor_version"
-    tor "org.briarproject:obfs4proxy:$obfs4_version@zip"
+    tor "org.briarproject:tor-linux:$tor_version"
+    tor "org.briarproject:obfs4proxy-linux:$obfs4_version"
 
     implementation "com.google.dagger:hilt-core:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"