Minor fixes

psiphon/upstreamproxy/proxy_http.go

@@ -48,12 +48,13 @@ package upstreamproxy
 import (
 	"bufio"
 	"errors"
-	//"fmt"
+	"fmt"
 	"golang.org/x/net/proxy"
 	"net"
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"strings"
 	"time"
 )
 

psiphon/upstreamproxy/transport_proxy_auth.go

@@ -30,7 +30,8 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
 		if err != nil {
 			return nil, err
 		}
-		return RoundTrip(req2)
+		//TODO: avoid going into endless loop due to bad proxy credentials
+		return t.RoundTrip(req2)
 	}
 	return resp, err
 }