diff --git a/TorWebClient/App.config b/TorWebClient/App.config index 507bfa9..89853c6 100644 --- a/TorWebClient/App.config +++ b/TorWebClient/App.config @@ -1,14 +1,14 @@ - + - - - + + + diff --git a/TorWebClient/Program.cs b/TorWebClient/Program.cs index 9867da4..a51cbb4 100644 --- a/TorWebClient/Program.cs +++ b/TorWebClient/Program.cs @@ -15,6 +15,7 @@ using MarketData; using MarketData.Utils; using Utility=MarketData.Utils.Utility; +// This project must be built in 32 bit mode. Due to the size of IntPtr being 64 and not 32 as needed. // Tor Current Version // https://www.torproject.org/download/tor/ @@ -269,7 +270,9 @@ namespace TorWebClient { try { - MDTrace.WriteLine(LogLevel.DEBUG,String.Format("Creating {0}",pathTorConfig)); + String currentWorkingDirectory = Directory.GetCurrentDirectory(); + pathTorConfig=currentWorkingDirectory+@"\Tor\Tor\"+pathTorConfig; + MDTrace.WriteLine(LogLevel.DEBUG,String.Format("Creating {0} ",pathTorConfig)); String pathBackupTorConfig=pathTorConfig+".bak"; if(File.Exists(pathTorConfig)) { @@ -439,7 +442,6 @@ namespace TorWebClient } static void Main(string[] args) { - Console.WriteLine("TorWebClient is running {0} bits.",Utility.Is64Bit()?64:32); try{Program.SetConsoleCtrlHandler(new HandlerRoutine(Program.ConsoleCtrlCheck),true);} catch(Exception exception){Console.WriteLine(exception.ToString());} if(!Utility.IsAdministrator()) diff --git a/TorWebClient/TorClient/bin/Debug/MarketDataLib.dll b/TorWebClient/TorClient/bin/Debug/MarketDataLib.dll index 36b76cc..68c8406 100644 Binary files a/TorWebClient/TorClient/bin/Debug/MarketDataLib.dll and b/TorWebClient/TorClient/bin/Debug/MarketDataLib.dll differ diff --git a/TorWebClient/TorClient/bin/Debug/MarketDataLib.pdb b/TorWebClient/TorClient/bin/Debug/MarketDataLib.pdb index 806c9ad..c22e5ab 100644 Binary files a/TorWebClient/TorClient/bin/Debug/MarketDataLib.pdb and b/TorWebClient/TorClient/bin/Debug/MarketDataLib.pdb differ diff --git a/TorWebClient/TorClient/bin/Debug/Tor.dll b/TorWebClient/TorClient/bin/Debug/Tor.dll index 227e195..ed9fd07 100644 Binary files a/TorWebClient/TorClient/bin/Debug/Tor.dll and b/TorWebClient/TorClient/bin/Debug/Tor.dll differ diff --git a/TorWebClient/TorClient/bin/Debug/Tor.pdb b/TorWebClient/TorClient/bin/Debug/Tor.pdb index a34d736..dc576b4 100644 Binary files a/TorWebClient/TorClient/bin/Debug/Tor.pdb and b/TorWebClient/TorClient/bin/Debug/Tor.pdb differ diff --git a/TorWebClient/TorClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TorWebClient/TorClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5c06ff7..16687b9 100644 Binary files a/TorWebClient/TorClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/TorWebClient/TorClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TorWebClient/TorClient/obj/Debug/Tor.csproj.FileListAbsolute.txt b/TorWebClient/TorClient/obj/Debug/Tor.csproj.FileListAbsolute.txt index c3fdcfa..58a30f5 100644 --- a/TorWebClient/TorClient/obj/Debug/Tor.csproj.FileListAbsolute.txt +++ b/TorWebClient/TorClient/obj/Debug/Tor.csproj.FileListAbsolute.txt @@ -17,3 +17,22 @@ C:\boneyard\Tor.Mod\TorWebClient\TorClient\bin\Debug\System.Runtime.CompilerServ C:\boneyard\Tor.Mod\TorWebClient\TorClient\obj\Debug\Tor.csprojResolveAssemblyReference.cache C:\boneyard\Tor.Mod\TorWebClient\TorClient\obj\Debug\Tor.dll C:\boneyard\Tor.Mod\TorWebClient\TorClient\obj\Debug\Tor.pdb +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Tor.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Tor.pdb +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\MarketDataLib.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\HtmlAgilityPack.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Newtonsoft.Json.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Axiom.Core.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\log4net.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\MarketDataLib.pdb +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Newtonsoft.Json.pdb +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Newtonsoft.Json.xml +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\Axiom.Core.pdb +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\log4net.xml +C:\boneyard\Tor\TorWebClient\TorClient\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\boneyard\Tor\TorWebClient\TorClient\obj\Debug\Tor.csprojResolveAssemblyReference.cache +C:\boneyard\Tor\TorWebClient\TorClient\obj\Debug\Tor.dll +C:\boneyard\Tor\TorWebClient\TorClient\obj\Debug\Tor.pdb diff --git a/TorWebClient/TorClient/obj/Debug/Tor.csprojResolveAssemblyReference.cache b/TorWebClient/TorClient/obj/Debug/Tor.csprojResolveAssemblyReference.cache index 1d0c0f3..ef71739 100644 Binary files a/TorWebClient/TorClient/obj/Debug/Tor.csprojResolveAssemblyReference.cache and b/TorWebClient/TorClient/obj/Debug/Tor.csprojResolveAssemblyReference.cache differ diff --git a/TorWebClient/TorClient/obj/Debug/Tor.dll b/TorWebClient/TorClient/obj/Debug/Tor.dll index 227e195..ed9fd07 100644 Binary files a/TorWebClient/TorClient/obj/Debug/Tor.dll and b/TorWebClient/TorClient/obj/Debug/Tor.dll differ diff --git a/TorWebClient/TorClient/obj/Debug/Tor.pdb b/TorWebClient/TorClient/obj/Debug/Tor.pdb index a34d736..dc576b4 100644 Binary files a/TorWebClient/TorClient/obj/Debug/Tor.pdb and b/TorWebClient/TorClient/obj/Debug/Tor.pdb differ diff --git a/TorWebClient/bin/Debug/MarketDataLib.dll b/TorWebClient/bin/Debug/MarketDataLib.dll index 36b76cc..68c8406 100644 Binary files a/TorWebClient/bin/Debug/MarketDataLib.dll and b/TorWebClient/bin/Debug/MarketDataLib.dll differ diff --git a/TorWebClient/bin/Debug/MarketDataLib.pdb b/TorWebClient/bin/Debug/MarketDataLib.pdb index 806c9ad..c22e5ab 100644 Binary files a/TorWebClient/bin/Debug/MarketDataLib.pdb and b/TorWebClient/bin/Debug/MarketDataLib.pdb differ diff --git a/TorWebClient/bin/Debug/Tor.dll b/TorWebClient/bin/Debug/Tor.dll index 227e195..ed9fd07 100644 Binary files a/TorWebClient/bin/Debug/Tor.dll and b/TorWebClient/bin/Debug/Tor.dll differ diff --git a/TorWebClient/bin/Debug/Tor.pdb b/TorWebClient/bin/Debug/Tor.pdb index a34d736..dc576b4 100644 Binary files a/TorWebClient/bin/Debug/Tor.pdb and b/TorWebClient/bin/Debug/Tor.pdb differ diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc b/TorWebClient/bin/Debug/Tor/Tor/torcc index 247bde1..da1863e 100644 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc +++ b/TorWebClient/bin/Debug/Tor/Tor/torcc @@ -4,6 +4,6 @@ AvoidDiskWrites 1 ControlPort 9051 ExitNodes {US} -GeoIPFile C:\boneyard\Tor.Mod\TorWebClient\bin\Debug\Tor\Tor\geoip -GeoIPv6File C:\boneyard\Tor.Mod\TorWebClient\bin\Debug\Tor\Tor\geoip6 +GeoIPFile geoip +GeoIPv6File geoip6 SocksPort 9050 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.bak b/TorWebClient/bin/Debug/Tor/Tor/torcc.bak index 247bde1..ef0fda3 100644 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.bak +++ b/TorWebClient/bin/Debug/Tor/Tor/torcc.bak @@ -1,9 +1,3 @@ -# This file was generated by Tor; if you edit it, comments will not be preserved -# The old torrc file was renamed to torrc.orig.1 or similar, and Tor will ignore it - +# Created by TorWebClient +# If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 -ControlPort 9051 -ExitNodes {US} -GeoIPFile C:\boneyard\Tor.Mod\TorWebClient\bin\Debug\Tor\Tor\geoip -GeoIPv6File C:\boneyard\Tor.Mod\TorWebClient\bin\Debug\Tor\Tor\geoip6 -SocksPort 9050 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.2 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.2 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.2 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.3 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.3 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.3 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.4 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.4 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.4 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.5 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.5 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.5 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.6 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.6 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.6 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.7 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.7 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.7 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.8 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.8 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.8 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.9 b/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.9 deleted file mode 100644 index ef0fda3..0000000 --- a/TorWebClient/bin/Debug/Tor/Tor/torcc.orig.9 +++ /dev/null @@ -1,3 +0,0 @@ -# Created by TorWebClient -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 diff --git a/TorWebClient/bin/Debug/TorProxy.exe b/TorWebClient/bin/Debug/TorProxy.exe index fcf3564..70432f3 100644 Binary files a/TorWebClient/bin/Debug/TorProxy.exe and b/TorWebClient/bin/Debug/TorProxy.exe differ diff --git a/TorWebClient/bin/Debug/TorProxy.exe.config b/TorWebClient/bin/Debug/TorProxy.exe.config index 507bfa9..89853c6 100644 --- a/TorWebClient/bin/Debug/TorProxy.exe.config +++ b/TorWebClient/bin/Debug/TorProxy.exe.config @@ -1,14 +1,14 @@ - + - - - + + + diff --git a/TorWebClient/bin/Debug/TorProxy.pdb b/TorWebClient/bin/Debug/TorProxy.pdb index 78c9f73..65c3fdd 100644 Binary files a/TorWebClient/bin/Debug/TorProxy.pdb and b/TorWebClient/bin/Debug/TorProxy.pdb differ diff --git a/TorWebClient/bin/Debug/TorProxy.vshost.exe.config b/TorWebClient/bin/Debug/TorProxy.vshost.exe.config index 507bfa9..89853c6 100644 --- a/TorWebClient/bin/Debug/TorProxy.vshost.exe.config +++ b/TorWebClient/bin/Debug/TorProxy.vshost.exe.config @@ -1,14 +1,14 @@ - + - - - + + + diff --git a/TorWebClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TorWebClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0fe202c..19b99ba 100644 Binary files a/TorWebClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/TorWebClient/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TorWebClient/obj/Debug/TorProxy.csproj.FileListAbsolute.txt b/TorWebClient/obj/Debug/TorProxy.csproj.FileListAbsolute.txt index ce86fa1..51821a5 100644 --- a/TorWebClient/obj/Debug/TorProxy.csproj.FileListAbsolute.txt +++ b/TorWebClient/obj/Debug/TorProxy.csproj.FileListAbsolute.txt @@ -33,3 +33,38 @@ C:\boneyard\Tor.Mod\TorWebClient\bin\Debug\System.Runtime.CompilerServices.Unsaf C:\boneyard\Tor.Mod\TorWebClient\obj\Debug\TorProxy.csprojResolveAssemblyReference.cache C:\boneyard\Tor.Mod\TorWebClient\obj\Debug\TorProxy.exe C:\boneyard\Tor.Mod\TorWebClient\obj\Debug\TorProxy.pdb +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libcrypto-1_1-x64.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libevent-2-1-7.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libevent_core-2-1-7.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libevent_extra-2-1-7.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libgcc_s_seh-1.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libssl-1_1-x64.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libssp-0.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\libwinpthread-1.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\tor.exe +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\zlib1.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\geoip +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\geoip6 +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\torrc-defaults +C:\boneyard\Tor\TorWebClient\bin\Debug\TorProxy.exe.config +C:\boneyard\Tor\TorWebClient\bin\Debug\TorProxy.exe +C:\boneyard\Tor\TorWebClient\bin\Debug\TorProxy.pdb +C:\boneyard\Tor\TorWebClient\bin\Debug\MarketDataLib.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\HtmlAgilityPack.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Newtonsoft.Json.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\Axiom.Core.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\System.Threading.Tasks.Extensions.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\log4net.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +C:\boneyard\Tor\TorWebClient\bin\Debug\MarketDataLib.pdb +C:\boneyard\Tor\TorWebClient\bin\Debug\Tor.pdb +C:\boneyard\Tor\TorWebClient\bin\Debug\Newtonsoft.Json.pdb +C:\boneyard\Tor\TorWebClient\bin\Debug\Newtonsoft.Json.xml +C:\boneyard\Tor\TorWebClient\bin\Debug\Axiom.Core.pdb +C:\boneyard\Tor\TorWebClient\bin\Debug\System.Threading.Tasks.Extensions.xml +C:\boneyard\Tor\TorWebClient\bin\Debug\log4net.xml +C:\boneyard\Tor\TorWebClient\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +C:\boneyard\Tor\TorWebClient\obj\Debug\TorProxy.csprojResolveAssemblyReference.cache +C:\boneyard\Tor\TorWebClient\obj\Debug\TorProxy.exe +C:\boneyard\Tor\TorWebClient\obj\Debug\TorProxy.pdb diff --git a/TorWebClient/obj/Debug/TorProxy.csprojResolveAssemblyReference.cache b/TorWebClient/obj/Debug/TorProxy.csprojResolveAssemblyReference.cache index f581672..49e9e95 100644 Binary files a/TorWebClient/obj/Debug/TorProxy.csprojResolveAssemblyReference.cache and b/TorWebClient/obj/Debug/TorProxy.csprojResolveAssemblyReference.cache differ diff --git a/TorWebClient/obj/Debug/TorProxy.exe b/TorWebClient/obj/Debug/TorProxy.exe index fcf3564..70432f3 100644 Binary files a/TorWebClient/obj/Debug/TorProxy.exe and b/TorWebClient/obj/Debug/TorProxy.exe differ diff --git a/TorWebClient/obj/Debug/TorProxy.pdb b/TorWebClient/obj/Debug/TorProxy.pdb index 78c9f73..65c3fdd 100644 Binary files a/TorWebClient/obj/Debug/TorProxy.pdb and b/TorWebClient/obj/Debug/TorProxy.pdb differ