Merge branch 'trunk' into beta_fixes

.drone.yml

@@ -28,9 +28,7 @@ steps:
       - name: deps
         path: /root/.pub-cache
     commands:
-      - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/tor
-      - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/torrc
-      - chmod a+x tor
+      - ./fetch-tor.sh
       - echo `git describe --tags` > VERSION
       - echo `date +%G-%m-%d-%H-%M` > BUILDDATE
       - flutter pub get
@@ -62,7 +60,7 @@ steps:
       - cp linux/libCwtch.so deploy/linux/lib/
       # should not be needed, should be in data/flutter_assets and work from there
       #- cp /sdks/flutter/bin/cache/artifacts/engine/linux-x64/icudtl.dat deploy/linux
-      - cp tor deploy/linux
+      - cp linux/tor deploy/linux
       - cd deploy
       - mv linux cwtch
       - tar -czf cwtch-`cat ../VERSION`.tar.gz cwtch

fetch-tor.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.5.9-linux-x86_64 -O linux/tor
+chmod a+x linux/tor
+
+mkdir -p android/app/src/main/jniLibs/arm64-v8a
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.4.9-arm64_pie -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
+chmod a+x android/app/src/main/jniLibs/arm64-v8a/libtor.so
+
+mkdir -p android/app/src/main/jniLibs/armeabi-v7a
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.4.9-arm_pie -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
+chmod a+x android/app/src/main/jniLibs/armeabi-v7a/libtor.so