Fix merging issues & API changes - that conflict resolution did not detect

src/NzbDrone.Common/Http/Dispatchers/CurlHttpDispatcher.cs

@@ -76,7 +76,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                         return s * n;
                     };
 
-                    if(request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(request.Url))
+                    if(request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(new Uri(request.Url.FullUri)))
                     
                     {
                         switch (request.Proxy.Type)

src/NzbDrone.Common/Http/Dispatchers/ManagedHttpDispatcher.cs

@@ -29,7 +29,7 @@ namespace NzbDrone.Common.Http.Dispatchers
                 webRequest.Timeout = (int)Math.Ceiling(request.RequestTimeout.TotalMilliseconds);
             }
 
-            if (request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(request.Url))
+            if (request.Proxy != null && !request.Proxy.ShouldProxyBeBypassed(new Uri(request.Url.FullUri)))
             {
                 var addresses = Dns.GetHostAddresses(request.Proxy.Host);
                 var socksUsername = request.Proxy.Username == null ? string.Empty : request.Proxy.Username;

src/NzbDrone.Common/NzbDrone.Common.csproj

@@ -45,6 +45,7 @@
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.3.0-rc1\lib\net40\NLog.dll</HintPath>
+    </Reference>
     <Reference Include="Org.Mentalis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNet4.SocksProxy.1.0.0.0\lib\net40\Org.Mentalis.dll</HintPath>
       <Private>True</Private>

src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs

@@ -32,7 +32,7 @@ namespace NzbDrone.Core.HealthCheck.Checks
                     return new HealthCheck(GetType(), HealthCheckResult.Error, "Failed to resolve the IP Address for the Configured Proxy Host:  " + _configService.ProxyHostname);
                 }
 
-                var request = new HttpRequestBuilder("https://services.sonarr.tv/").Build("/ping");
+                var request = new HttpRequestBuilder("https://services.sonarr.tv/ping").Build();
 
                 try
                 {