Commit eb453835 authored by justcoding121's avatar justcoding121 Committed by justcoding121

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
parents 770d4850 9c50628b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment