Proper use of http timeouts

psiphon/meekConn.go

@@ -196,6 +196,7 @@ func DialMeek(
 			TrustedCACertificatesFilename: meekDialConfig.TrustedCACertificatesFilename,
 		})
 
+		// TODO: wrap in an http.Client and use http.Client.Timeout which actually covers round trip
 		transport = &http.Transport{
 			Dial: dialer,
 			ResponseHeaderTimeout: MEEK_ROUND_TRIP_TIMEOUT,
@@ -229,6 +230,7 @@ func DialMeek(
 			dialer = NewTCPDialer(meekDialConfig)
 		}
 
+		// TODO: wrap in an http.Client and use http.Client.Timeout which actually covers round trip
 		httpTransport := &http.Transport{
 			Proxy: proxyUrl,
 			Dial:  dialer,

psiphon/net.go

@@ -481,7 +481,6 @@ func MakeTunneledHttpClient(
 
 	transport := &http.Transport{
 		Dial: tunneledDialer,
-		ResponseHeaderTimeout: requestTimeout,
 	}
 
 	if config.UseTrustedCACertificatesForStockTLS {

psiphon/serverApi.go

@@ -905,7 +905,6 @@ func makePsiphonHttpsClient(tunnel *Tunnel) (httpsClient *http.Client, err error
 		})
 	transport := &http.Transport{
 		Dial: dialer,
-		ResponseHeaderTimeout: timeout,
 	}
 	return &http.Client{
 		Transport: transport,