Merge pull request #86 from rod-hynes/master

Fix: NoticeUpstreamProxyError bugs

psiphon/TCPConn_windows.go

@@ -73,8 +73,10 @@ func interruptibleTCPDial(addr string, config *DialConfig) (conn *TCPConn, err e
 
 		netConn, err := net.DialTimeout("tcp", dialAddr, config.ConnectTimeout)
 
-		if err == nil && config.UpstreamHttpProxyAddress != "" {
-			err = HttpProxyConnect(netConn, addr)
+		if config.UpstreamHttpProxyAddress != "" {
+			if err == nil {
+				err = HttpProxyConnect(netConn, addr)
+			}
 			if err != nil {
 				NoticeUpstreamProxyError(err)
 			}

psiphon/notice.go

@@ -177,7 +177,7 @@ func NoticeSplitTunnelRegion(region string) {
 // NoticeUpstreamProxyError reports an error when connecting to an upstream proxy. The
 // user may have input, for example, an incorrect address or incorrect credentials.
 func NoticeUpstreamProxyError(err error) {
-	outputNotice("UpstreamProxyError", true, "errorMessage", fmt.Sprintf("%s", err))
+	outputNotice("UpstreamProxyError", true, "message", fmt.Sprintf("%s", err))
 }
 
 type noticeObject struct {