Upgrade to Framework 4.7

TorWebClient/App.config

@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="torConfigurationFile" value="torcc" />
+    <add key="torConfigurationFile" value="torcc"/>
-    <add key="torControlPassword" value="" />
+    <add key="torControlPassword" value=""/>
-		<add key="captureTorConsoleOuput" value="true" />
+		<add key="captureTorConsoleOuput" value="true"/>
-		<add key="torControlPort" value="9051" />
+		<add key="torControlPort" value="9051"/>
-    <add key="torDefaultConfigurationFile" value="" />
+    <add key="torDefaultConfigurationFile" value=""/>
-		<add key="geoipfile" value="geoip" />
+		<add key="geoipfile" value="geoip"/>
-		<add key="geoip6file" value="geoip6" />
+		<add key="geoip6file" value="geoip6"/>
-		<add key="torPath" value="Tor\Tor\Tor.exe" />
+		<add key="torPath" value="Tor\Tor\Tor.exe"/>
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

TorWebClient/TorClient/Tor.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Tor</RootNamespace>
     <AssemblyName>Tor</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

TorWebClient/TorProxy.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TorProxy</RootNamespace>
     <AssemblyName>TorProxy</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>

TorWebClient/bin/Debug/TorProxy.exe.config

@@ -1,29 +1,29 @@
 <?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="torConfigurationFile" value="torcc" />
+    <add key="torConfigurationFile" value="torcc"/>
-    <add key="torControlPassword" value="" />
+    <add key="torControlPassword" value=""/>
-		<add key="captureTorConsoleOuput" value="true" />
+		<add key="captureTorConsoleOuput" value="true"/>
-		<add key="torControlPort" value="9051" />
+		<add key="torControlPort" value="9051"/>
-    <add key="torDefaultConfigurationFile" value="" />
+    <add key="torDefaultConfigurationFile" value=""/>
-		<add key="geoipfile" value="geoip" />
+		<add key="geoipfile" value="geoip"/>
-		<add key="geoip6file" value="geoip6" />
+		<add key="geoip6file" value="geoip6"/>
-		<add key="torPath" value="Tor\Tor\Tor.exe" />
+		<add key="torPath" value="Tor\Tor\Tor.exe"/>
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>

TorWebClient/bin/Release/Tor/Tor/torcc.bak

@@ -1,9 +1,3 @@
-# This file was generated by Tor; if you edit it, comments will not be preserved
+# Created by TorWebClient
-# The old torrc file was renamed to torrc.orig.1 or similar, and Tor will ignore it
+# If non-zero, try to write to disk less frequently than we would otherwise.
-
 AvoidDiskWrites 1
-ControlPort 9051
-ExitNodes {US}
-GeoIPFile geoip
-GeoIPv6File geoip6
-SocksPort 9050

TorWebClient/obj/Debug/TorProxy.csproj.FileListAbsolute.txt

@@ -36,7 +36,6 @@ C:\boneyard\Tor.Mod\TorWebClient\obj\Debug\TorProxy.pdb
 C:\boneyard\Tor.Backup\TorWebClient\bin\Debug\TorProxy.exe.config
 C:\boneyard\Tor.Backup\TorWebClient\obj\Debug\TorProxy.exe
 C:\boneyard\Tor.Backup\TorWebClient\obj\Debug\TorProxy.pdb
-C:\boneyard\Tor\TorWebClient\bin\Debug\Tor\Tor\geoip6
 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
@@ -49,6 +48,7 @@ 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\App.config
 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