[tor-commits] [meek/master] http-proxy can be a SOCKS arg too.

[dcf at torproject.org]

commit 9c951ff6d77258e459c366c2ae7c24900c0cc922
Author: David Fifield <david at bamsoftware.com>
Date:   Wed May 7 21:23:54 2014 -0700

    http-proxy can be a SOCKS arg too.
---
 meek-client/meek-client.go |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go
index b3cce7a..b191603 100644
--- a/meek-client/meek-client.go
+++ b/meek-client/meek-client.go
@@ -321,7 +321,7 @@ func main() {
 
 	flag.StringVar(&options.Front, "front", "", "front domain name if no front= SOCKS arg")
 	flag.StringVar(&helperAddr, "helper", "", "address of HTTP helper (browser extension)")
-	flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from HTTP_PROXY environment variable)")
+	flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from http-proxy= SOCKS arg or HTTP_PROXY environment variable)")
 	flag.StringVar(&logFilename, "log", "", "name of log file")
 	flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg")
 	flag.Parse()