Merge branch 'torwin' of dan/ui into master

2019-03-03 01:12:57 +00:00 · 2019-03-03 01:12:57 +00:00 · dd1df6f916
parent c84d5eb643 cb64131d0b
commit dd1df6f916
16 changed files with 221100 additions and 1 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -53,6 +53,7 @@ pipeline:
      - find -iname 'rcc*' | xargs rm
      - go get -d
      - qtdeploy build windows
+      - cp windows/* deploy/windows
      - zip -r deploy/cwtch-windows-`date +%G-%m-%d-%H-%M`.zip deploy/windows
  deploy-buildfiles:
    image: pivotaldata/concourse-ssh
--- a/.gitignore
+++ b/.gitignore
@ -5,4 +5,3 @@ rcc*
 *.qmlc
 *.jsc
 vendor/
-tor/
--- a/windows/tor-0.3.5.7/Data/Tor/geoip
+++ b/windows/tor-0.3.5.7/Data/Tor/geoip
--- a/windows/tor-0.3.5.7/Data/Tor/geoip6
+++ b/windows/tor-0.3.5.7/Data/Tor/geoip6
--- a/windows/tor-0.3.5.7/Tor/libeay32.dll
+++ b/windows/tor-0.3.5.7/Tor/libeay32.dll
--- a/windows/tor-0.3.5.7/Tor/libevent-2-1-6.dll
+++ b/windows/tor-0.3.5.7/Tor/libevent-2-1-6.dll
--- a/windows/tor-0.3.5.7/Tor/libevent_core-2-1-6.dll
+++ b/windows/tor-0.3.5.7/Tor/libevent_core-2-1-6.dll
--- a/windows/tor-0.3.5.7/Tor/libevent_extra-2-1-6.dll
+++ b/windows/tor-0.3.5.7/Tor/libevent_extra-2-1-6.dll
--- a/windows/tor-0.3.5.7/Tor/libgcc_s_sjlj-1.dll
+++ b/windows/tor-0.3.5.7/Tor/libgcc_s_sjlj-1.dll
--- a/windows/tor-0.3.5.7/Tor/libssp-0.dll
+++ b/windows/tor-0.3.5.7/Tor/libssp-0.dll
--- a/windows/tor-0.3.5.7/Tor/libwinpthread-1.dll
+++ b/windows/tor-0.3.5.7/Tor/libwinpthread-1.dll
--- a/windows/tor-0.3.5.7/Tor/ssleay32.dll
+++ b/windows/tor-0.3.5.7/Tor/ssleay32.dll
--- a/windows/tor-0.3.5.7/Tor/tor-gencert.exe
+++ b/windows/tor-0.3.5.7/Tor/tor-gencert.exe
--- a/windows/tor-0.3.5.7/Tor/tor.exe
+++ b/windows/tor-0.3.5.7/Tor/tor.exe
--- a/windows/tor-0.3.5.7/Tor/torrc
+++ b/windows/tor-0.3.5.7/Tor/torrc
@ -0,0 +1,5 @@
+SOCKSPort 9050
+ControlPort 9051
+CookieAuthentication 0
+# Needed for integ tests
+RunAsDaemon 0
--- a/windows/tor-0.3.5.7/Tor/zlib1.dll
+++ b/windows/tor-0.3.5.7/Tor/zlib1.dll