September 2014 - tor-commits - lists.torproject.org

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 0a5c219c508a1483d7030a24f30d100debd3a402 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 15:45:37 2014 +0000 Update translations for tor-launcher-properties --- eu/torlauncher.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eu/torlauncher.properties b/eu/torlauncher.properties index 7d2c0a9..073e987 100644 --- a/eu/torlauncher.properties +++ b/eu/torlauncher.properties @@ -3,8 +3,8 @@ torlauncher.error_title=Tor abiarazlea -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. -torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.tor_exited=Tor ustekabean irten da. Hau Toren akats bategatik, zure sistemako beste programa bategatik, edo hardware akastunaren erruagatik izan daiteke. Tor berrabiarazten duzun bitartean, Tor Browserek ezingo du webguneak ireki. Arazoak jarraitzen badu, mesedez bidali Tor erregistroaren kopia bat laguntza taldeari. +torlauncher.tor_exited2=Tor berrabiarazteak ez ditu zure nabigatzatilearen fitxak itxiko. torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu. torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan. torlauncher.tor_control_failed=Huts Toren kontrola hartzerakoan. @@ -30,14 +30,14 @@ torlauncher.error_bridge_bad_default_type=Ez daude eskuragarri %S garraio mota d torlauncher.recommended_bridge=(gomendatuta) torlauncher.connect=Konektatu -torlauncher.restart_tor=Restart Tor +torlauncher.restart_tor=Tor berrabiarazi torlauncher.quit=Irten torlauncher.quit_win=Irten torlauncher.done=Eginda torlauncher.forAssistance=Laguntza lortzeko, %S(r)ekin harremanetan jarri -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. +torlauncher.copiedNLogMessages=Kopia burutu da. %S Tor erregistro mezuak prest daude testu editore edo email mezu batean itsasteko. torlauncher.bootstrapStatus.conn_dir=Errele direktorio batera konektatzen torlauncher.bootstrapStatus.handshake_dir=Enkriptatutako direktorio batera konexioa ezartzen @@ -58,4 +58,4 @@ torlauncher.bootstrapWarning.identity=nortasuna ez dator bat torlauncher.bootstrapWarning.timeout=konexioa denboraz kanpo torlauncher.bootstrapWarning.noroute=ez dago biderik ostalarira torlauncher.bootstrapWarning.ioerror=irakurketa/idazketa akatsa -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=pluggable transport falta da

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 7132dfce7d01b12b1bc4622de7f75a762eb3aea5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 15:45:23 2014 +0000 Update translations for https_everywhere_completed --- eu/ssl-observatory.dtd | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/eu/ssl-observatory.dtd b/eu/ssl-observatory.dtd index 9baefec..30187b3 100644 --- a/eu/ssl-observatory.dtd +++ b/eu/ssl-observatory.dtd @@ -41,6 +41,12 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.asn_tooltip "Honek zure sarearen "Sistema Autonomo zenbakia" lortu eta bidaliko du. Hau HTTPSren aurkako erasoak aurkitzen lagunduko gaitu, eta erasoak konparatiboki arruntak diren Iran eta Siria bezalako lekuetan behaketak ditugun zehaztu."> +<!ENTITY ssl-observatory.prefs.show_cert_warning +"Erakutsi abisu bat Behatokiak zure nabigatzaileak harrapatu ez duen ezeztatutako ziurtagiri bat antzematen duenean"> + +<!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip +"Honek aurkeztutako ziurtagiriak egiaztatuko ditu Ezeztatutako Ziurtagirien Zerrendan. Zoritxarrez ezin dugu ezeztatutako ziurtagiri guztiak markatuko ditugula bermatu, baina abisu bat ikusten baduzu zerbait oker joan dela susma dezakezu."> + <!ENTITY ssl-observatory.prefs.done "Eginda"> <!ENTITY ssl-observatory.prefs.explanation @@ -82,7 +88,7 @@ Xehetasun gehiagorako pasa ezazu sagua aukeren gainetik:"> <!ENTITY ssl-observatory.warning.showcert "Ziurtagiri katea erakutsi"> <!ENTITY ssl-observatory.warning.okay "Ulertzen dut"> <!ENTITY ssl-observatory.warning.text "EFFren SSL Behatokiak leku honen HTTPS ziurtagiri(ar)entzako abisua igorri du:"> -<!ENTITY ssl-observatory.warning.defense "Leku honetan saioa hasi baduzu, konexio seguru bat duzunean zure pasahitza aldatzea komeni da."> +<!ENTITY ssl-observatory.warning.defense "Webgune honetan saioa hasi baduzu, komeni litzateke konexio seguru bat duzunean pasahitza aldatzea. (Abisu hauek HTTPS Everywhereren "SSL Behatokia" hobespenen fitxan ezgaitu daitezke.)"> <!ENTITY ssl-observatory.prefs.self_signed "Bidali eta egiaztatu norberak-sinatutako ziurtagiriak">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 6ca9845d82a3381bb3b9ef32e3110429ddaef6eb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 15:45:19 2014 +0000 Update translations for https_everywhere --- eu/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/ssl-observatory.dtd b/eu/ssl-observatory.dtd index 13e7834..30187b3 100644 --- a/eu/ssl-observatory.dtd +++ b/eu/ssl-observatory.dtd @@ -42,10 +42,10 @@ to turn it on?">--> "Honek zure sarearen "Sistema Autonomo zenbakia" lortu eta bidaliko du. Hau HTTPSren aurkako erasoak aurkitzen lagunduko gaitu, eta erasoak konparatiboki arruntak diren Iran eta Siria bezalako lekuetan behaketak ditugun zehaztu."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Show a warning when the Observatory detects a revoked certificate not caught by your browser"> +"Erakutsi abisu bat Behatokiak zure nabigatzaileak harrapatu ez duen ezeztatutako ziurtagiri bat antzematen duenean"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"This will check submitted certificates against known Certificate Revocation Lists. Unfortunately we cannot guarantee that we will flag every revoked certificate, but if you do see a warning there's a good chance something is wrong."> +"Honek aurkeztutako ziurtagiriak egiaztatuko ditu Ezeztatutako Ziurtagirien Zerrendan. Zoritxarrez ezin dugu ezeztatutako ziurtagiri guztiak markatuko ditugula bermatu, baina abisu bat ikusten baduzu zerbait oker joan dela susma dezakezu."> <!ENTITY ssl-observatory.prefs.done "Eginda"> @@ -88,7 +88,7 @@ Xehetasun gehiagorako pasa ezazu sagua aukeren gainetik:"> <!ENTITY ssl-observatory.warning.showcert "Ziurtagiri katea erakutsi"> <!ENTITY ssl-observatory.warning.okay "Ulertzen dut"> <!ENTITY ssl-observatory.warning.text "EFFren SSL Behatokiak leku honen HTTPS ziurtagiri(ar)entzako abisua igorri du:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.defense "Webgune honetan saioa hasi baduzu, komeni litzateke konexio seguru bat duzunean pasahitza aldatzea. (Abisu hauek HTTPS Everywhereren "SSL Behatokia" hobespenen fitxan ezgaitu daitezke.)"> <!ENTITY ssl-observatory.prefs.self_signed "Bidali eta egiaztatu norberak-sinatutako ziurtagiriak">

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit c6ca3bbe80258f8e4b4f02a0903decae0c8b83b2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 15:45:13 2014 +0000 Update translations for torcheck_completed --- eu/torcheck.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eu/torcheck.po b/eu/torcheck.po index 6b6a9a5..338fe08 100644 --- a/eu/torcheck.po +++ b/eu/torcheck.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-01-09 15:30+0000\n" +"PO-Revision-Date: 2014-09-25 15:41+0000\n" "Last-Translator: Antxon Baldarra <baldarra(a)bitmessage.ch>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" @@ -94,3 +94,6 @@ msgstr "JavaScript gaituta dago." msgid "JavaScript is disabled." msgstr "JavaScript ezgaituta dago." + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "Hala ere, ez du ematen Tor Browser Bundlea denik."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 25 Sep '14

25 Sep '14

commit 6a676ca1ee602f9de3290338cf332c5b8168e55b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 25 15:45:09 2014 +0000 Update translations for torcheck --- eu/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eu/torcheck.po b/eu/torcheck.po index 2431922..338fe08 100644 --- a/eu/torcheck.po +++ b/eu/torcheck.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 08:21+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-25 15:41+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)bitmessage.ch>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,4 +96,4 @@ msgid "JavaScript is disabled." msgstr "JavaScript ezgaituta dago." msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "Hala ere, ez du ematen Tor Browser Bundlea denik."

1 0

[meek/master] Make checkProxyURL use its argument.
by dcf＠torproject.org 25 Sep '14

25 Sep '14

commit 12debe1d87d3a6ba466bccfb14fe6bb3c937dfdb Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 25 01:40:59 2014 -0700 Make checkProxyURL use its argument. It was using the same global variable as was passed as the argument, so the behavior was still correct. --- meek-client/meek-client.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 06077a9..9024032 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -344,8 +344,8 @@ func acceptLoop(ln *pt.SocksListener) error { func checkProxyURL(u *url.URL) error { if options.HelperAddr == nil { // Without the helper we only support HTTP proxies. - if options.ProxyURL.Scheme != "http" { - return errors.New(fmt.Sprintf("don't understand proxy URL scheme %q", options.ProxyURL.Scheme)) + if u.Scheme != "http" { + return errors.New(fmt.Sprintf("don't understand proxy URL scheme %q", u.Scheme)) } } else { // With the helper we can use HTTP and SOCKS (because it is the @@ -359,12 +359,12 @@ func checkProxyURL(u *url.URL) error { // https://gitweb.torproject.org/tor-browser.git/commitdiff/e08b91c78d919f66dd… // https://bugzilla.mozilla.org/show_bug.cgi?id=1017769 // https://hg.mozilla.org/mozilla-central/rev/a1f6458800d4 - switch options.ProxyURL.Scheme { + switch u.Scheme { case "http", "socks5", "socks4a": default: - return errors.New(fmt.Sprintf("don't understand proxy URL scheme %q", options.ProxyURL.Scheme)) + return errors.New(fmt.Sprintf("don't understand proxy URL scheme %q", u.Scheme)) } - if options.ProxyURL.User != nil { + if u.User != nil { return errors.New("a proxy URL with a username or password can't be used with --helper") } }

1 0

[meek/master] Whitespace in meek-server/README.
by dcf＠torproject.org 25 Sep '14

25 Sep '14

commit 6a50ec68c5c8eae88bbe62be1122a15fc5c71c34 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 25 02:25:36 2014 -0700 Whitespace in meek-server/README. --- meek-server/README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meek-server/README b/meek-server/README index 1164bc2..d49d9ca 100644 --- a/meek-server/README +++ b/meek-server/README @@ -10,10 +10,10 @@ ServerTransportPlugin meek exec /usr/local/bin/meek-server --port 7443 --cert /etc/meek/cert.pem --key /etc/meek/key.pem --log /var/log/tor/meek-server-https.log - To test your bridge on the clinet side, you can add a line like this to your torrc: - + Bridge meek 0.0.2.0:3 url=http://my-bridge.example.com:7002/ -# Important Note: +# Important Note: If you're running more than one transport, you need a separate tor process for each, to avoid user counting confusion. For more information, see https://lists.torproject.org/pipermail/tor-dev/2014-September/007480.html and https://trac.torproject.org/projects/tor/wiki/doc/meek#Users

1 0

[meek/master] Don't allow overriding the proxy per-request.
by dcf＠torproject.org 25 Sep '14

25 Sep '14

commit 6beb65b2dea5a68081f21da3abc2ec35b5cee286 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 25 01:45:02 2014 -0700 Don't allow overriding the proxy per-request. --- doc/meek-client.1.txt | 7 +++---- meek-client/meek-client.go | 24 +++++------------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt index 601836b..cc5036a 100644 --- a/doc/meek-client.1.txt +++ b/doc/meek-client.1.txt @@ -53,8 +53,7 @@ HTTPSProxy localhost:8080 Socks4Proxy localhost:1080 Socks5Proxy localhost:1080 ---- -or, equivalently, using the **--proxy** command-line option or **proxy** -SOCKS arg. +or, equivalently, using the **--proxy** command-line option. When the **--helper** option is used, you can use any type of proxy: HTTP or SOCKS. Without **--helper**, you can only use an HTTP proxy. @@ -73,8 +72,8 @@ OPTIONS URL of upstream proxy. For example, **--proxy=http://localhost:8080/**, **--proxy=socks4a://localhost:1080**, or - **--proxy=socks5://localhost:1080**. The **proxy** SOCKS arg - overrides the command line. You would normally control the proxy + **--proxy=socks5://localhost:1080**. + You would normally control the proxy using the **HTTPSProxy**, **Socks4Proxy**, or **Socks5Proxy** configuration options in a torrc file, instead of using this option. diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 9024032..d39e06a 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -105,19 +105,17 @@ type RequestInfo struct { // The Host header to put in the HTTP request (optional and may be // different from the host name in URL). Host string - // URL of an upstream proxy to use. If nil, no proxy is used. - ProxyURL *url.URL } // Do an HTTP roundtrip using the payload data in buf and the request metadata // in info. func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { tr := new(http.Transport) - if info.ProxyURL != nil { - if info.ProxyURL.Scheme != "http" { - panic(fmt.Sprintf("don't know how to use proxy %s", info.ProxyURL.String())) + if options.ProxyURL != nil { + if options.ProxyURL.Scheme != "http" { + panic(fmt.Sprintf("don't know how to use proxy %s", options.ProxyURL.String())) } - tr.Proxy = http.ProxyURL(info.ProxyURL) + tr.Proxy = http.ProxyURL(options.ProxyURL) } req, err := http.NewRequest("POST", info.URL.String(), bytes.NewReader(buf)) if err != nil { @@ -303,18 +301,6 @@ func handler(conn *pt.SocksConn) error { info.URL.Host = front } - // First check proxy= SOCKS arg, then --proxy option/managed - // configuration. - proxy, ok := conn.Req.Args.Get("proxy") - if ok { - info.ProxyURL, err = url.Parse(proxy) - if err != nil { - return err - } - } else if options.ProxyURL != nil { - info.ProxyURL = options.ProxyURL - } - return copyLoop(conn, &info) } @@ -380,7 +366,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(&logFilename, "log", "", "name of log file") - flag.StringVar(&proxy, "proxy", "", "proxy URL if no proxy= SOCKS arg") + flag.StringVar(&proxy, "proxy", "", "proxy URL") flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") flag.Parse()

1 0

[meek/master] Reuse the same RoundTripper for all requests.
by dcf＠torproject.org 25 Sep '14

25 Sep '14

commit a4427ae4f5907a8afc538f4403bf475148b273dc Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 25 02:01:12 2014 -0700 Reuse the same RoundTripper for all requests. Previously we were creating a new http.Transport for each request, and selectively overriding the Proxy member. Since that code was first added, http.DefaultTransport has gotten other non-zero settings than Proxy: Dial and TLSHandshakeTimeout. https://code.google.com/p/go/source/diff?spec=svn733fefb1deae5490f2d6fcf498… https://code.google.com/p/go/source/diff?spec=svnc8edfe4ddd5a28d929503ac34d… We want to use those settings, but we also want to disable the default ProxyFromEnvironment. Creating a new Transport every time was messing with persistent connections; I watched as meek-client made a new TCP connection for every request. With this change, it reuses the same connection. Something must have changed in the http library (perhaps one of the revisions cited above), because I remember it using a persistent connection in the past. This only makes a difference when not using --helper. The browser helper handles all its own persistence stuff. --- meek-client/meek-client.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index d39e06a..33861e5 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -82,6 +82,10 @@ const ( var ptInfo pt.ClientInfo +// This is the RoundTripper used to make all our requests (when --helper is not +// used). +var httpTransport http.Transport + // Store for command line options. var options struct { URL string @@ -110,13 +114,6 @@ type RequestInfo struct { // Do an HTTP roundtrip using the payload data in buf and the request metadata // in info. func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { - tr := new(http.Transport) - if options.ProxyURL != nil { - if options.ProxyURL.Scheme != "http" { - panic(fmt.Sprintf("don't know how to use proxy %s", options.ProxyURL.String())) - } - tr.Proxy = http.ProxyURL(options.ProxyURL) - } req, err := http.NewRequest("POST", info.URL.String(), bytes.NewReader(buf)) if err != nil { return nil, err @@ -125,7 +122,7 @@ func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { req.Host = info.Host } req.Header.Set("X-Session-Id", info.SessionID) - return tr.RoundTrip(req) + return httpTransport.RoundTrip(req) } // Do a roundtrip, trying at most limit times if there is an HTTP status other @@ -394,6 +391,13 @@ func main() { } } + // We make a copy of DefaultTransport because we want the default Dial + // and TLSHandshakeTimeout settings. But we want to disable the default + // ProxyFromEnvironment setting. Proxy is overridden below if proxyURL + // is set. + httpTransport = *http.DefaultTransport.(*http.Transport) + httpTransport.Proxy = nil + ptInfo, err = pt.ClientSetup([]string{ptMethodName}) if err != nil { log.Fatalf("error in ClientSetup: %s", err) @@ -416,6 +420,7 @@ func main() { log.Fatal(fmt.Sprintf("proxy error: %s", err)) } log.Printf("using proxy %s", options.ProxyURL.String()) + httpTransport.Proxy = http.ProxyURL(options.ProxyURL) if ptProxyURL != nil { PtProxyDone() }

1 0

[meek/master] Regen man pages.
by dcf＠torproject.org 25 Sep '14

25 Sep '14

commit 617129e68b7bd162e416cb1bf6c44703d28e627d Author: David Fifield <david(a)bamsoftware.com> Date: Thu Sep 25 02:24:33 2014 -0700 Regen man pages. --- doc/meek-client.1 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/meek-client.1 b/doc/meek-client.1 index f5e7702..78ca4fe 100644 --- a/doc/meek-client.1 +++ b/doc/meek-client.1 @@ -2,12 +2,12 @@ .\" Title: meek-client .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 08/10/2014 +.\" Date: 09/25/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MEEK\-CLIENT" "1" "08/10/2014" "\ \&" "\ \&" +.TH "MEEK\-CLIENT" "1" "09/25/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -80,7 +80,7 @@ Socks5Proxy localhost:1080 .RE .\} .sp -or, equivalently, using the \fB\-\-proxy\fR command\-line option or \fBproxy\fR SOCKS arg\&. +or, equivalently, using the \fB\-\-proxy\fR command\-line option\&. .sp When the \fB\-\-helper\fR option is used, you can use any type of proxy: HTTP or SOCKS\&. Without \fB\-\-helper\fR, you can only use an HTTP proxy\&. .SH "OPTIONS" @@ -103,9 +103,7 @@ Address of HTTP helper browser extension\&. For example, URL of upstream proxy\&. For example, \fB\-\-proxy=http://localhost:8080/\fR, \fB\-\-proxy=socks4a://localhost:1080\fR, or -\fB\-\-proxy=socks5://localhost:1080\fR\&. The -\fBproxy\fR -SOCKS arg overrides the command line\&. You would normally control the proxy using the +\fB\-\-proxy=socks5://localhost:1080\fR\&. You would normally control the proxy using the \fBHTTPSProxy\fR, \fBSocks4Proxy\fR, or \fBSocks5Proxy\fR

1 0