Merge fb2dcc2 into 94cf15e

Author: Jonathan Ginsburg

lib/middleware/proxy.js

@@ -34,7 +34,7 @@ function parseProxyConfig (proxies, config) {
 
     const hostname = proxyDetails.hostname || config.hostname
     const protocol = proxyDetails.protocol || config.protocol
-    const https = proxyDetails.protocol === 'https:'
+    const https = protocol === 'https:'
     let port
     if (proxyDetails.port) {
       port = proxyDetails.port