Merge branch 'stable' of https://github.com/justcoding121/Titanium-Web-Proxy into beta
# Conflicts: # Examples/Titanium.Web.Proxy.Examples.Basic/ProxyTestController.cs # Titanium.Web.Proxy/Helpers/CustomBinaryReader.cs # Titanium.Web.Proxy/Helpers/Network.cs # Titanium.Web.Proxy/Helpers/Tcp.cs # Titanium.Web.Proxy/Http/HeaderParser.cs # Titanium.Web.Proxy/Http/HttpWebClient.cs # Titanium.Web.Proxy/Http/Request.cs # Titanium.Web.Proxy/Network/CertificateManager.cs # Titanium.Web.Proxy/Network/Tcp/TcpConnection.cs # Titanium.Web.Proxy/Network/Tcp/TcpConnectionFactory.cs # Titanium.Web.Proxy/ProxyAuthorizationHandler.cs # Titanium.Web.Proxy/ProxyServer.cs # Titanium.Web.Proxy/RequestHandler.cs # Titanium.Web.Proxy/ResponseHandler.cs
Showing
Please
register
or
sign in
to comment