Merge branch 'master' into torVer

2020-12-01 14:33:20 -08:00 · 2020-12-01 14:33:20 -08:00 · a942bfbba1
parent 2035e44cfd 07cbb1054b
commit a942bfbba1
28 changed files with 66197 additions and 30636 deletions
--- a/android/libs/armeabi-v7a/libtor.so
+++ b/android/libs/armeabi-v7a/libtor.so
--- a/linux/tor
+++ b/linux/tor
--- a/main.go
+++ b/main.go
@ -247,7 +247,7 @@ func loadACN() {
 			ex = ""
 		}
 		exPath := filepath.Dir(ex)
-		torpath = filepath.Join(exPath, "tor-0.3.5.7", "Tor", "tor.exe")
+		torpath = filepath.Join(exPath, "tor-0.4.4.6", "Tor", "tor.exe")
 	} else {
 		dir, _ := filepath.Abs(filepath.Dir(os.Args[0]))
 		if _, err := os.Stat(filepath.Join(dir, "tor")); os.IsNotExist(err) {
--- 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/zlib1.dll
+++ b/windows/tor-0.3.5.7/Tor/zlib1.dll
--- a/windows/tor-0.4.4.6/Data/Tor/geoip
+++ b/windows/tor-0.4.4.6/Data/Tor/geoip
--- a/windows/tor-0.4.4.6/Data/Tor/geoip6
+++ b/windows/tor-0.4.4.6/Data/Tor/geoip6
--- a/windows/tor-0.4.4.6/Tor/libcrypto-1_1.dll
+++ b/windows/tor-0.4.4.6/Tor/libcrypto-1_1.dll
--- a/windows/tor-0.4.4.6/Tor/libevent-2-1-7.dll
+++ b/windows/tor-0.4.4.6/Tor/libevent-2-1-7.dll
--- a/windows/tor-0.4.4.6/Tor/libevent_core-2-1-7.dll
+++ b/windows/tor-0.4.4.6/Tor/libevent_core-2-1-7.dll
--- a/windows/tor-0.4.4.6/Tor/libevent_extra-2-1-7.dll
+++ b/windows/tor-0.4.4.6/Tor/libevent_extra-2-1-7.dll
--- a/windows/tor-0.4.4.6/Tor/libgcc_s_sjlj-1.dll
+++ b/windows/tor-0.4.4.6/Tor/libgcc_s_sjlj-1.dll
--- a/windows/tor-0.4.4.6/Tor/libssl-1_1.dll
+++ b/windows/tor-0.4.4.6/Tor/libssl-1_1.dll
--- a/windows/tor-0.4.4.6/Tor/libssp-0.dll
+++ b/windows/tor-0.4.4.6/Tor/libssp-0.dll
--- a/windows/tor-0.4.4.6/Tor/libwinpthread-1.dll
+++ b/windows/tor-0.4.4.6/Tor/libwinpthread-1.dll
--- a/windows/tor-0.4.4.6/Tor/tor-gencert.exe
+++ b/windows/tor-0.4.4.6/Tor/tor-gencert.exe
--- a/windows/tor-0.4.4.6/Tor/tor.exe
+++ b/windows/tor-0.4.4.6/Tor/tor.exe
--- a/windows/tor-0.4.4.6/Tor/torrc
+++ b/windows/tor-0.4.4.6/Tor/torrc
--- a/windows/tor-0.4.4.6/Tor/zlib1.dll
+++ b/windows/tor-0.4.4.6/Tor/zlib1.dll