Merge branch 'trunk' into torUp

.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