commit e4bc7b1c3aae41252f64b3affc8c08e525831e08 Author: David Fifield <david@bamsoftware.com> Date: Fri Feb 1 20:56:27 2019 -0700 Update meek-client.1 with uTLS proxy support. Was aiming for parity with net/http. --- doc/meek-client.1 | 11 +++++++---- doc/meek-client.1.txt | 12 +++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/doc/meek-client.1 b/doc/meek-client.1 index 1ca6640..635cb7f 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.79.1 <http://docbook.sf.net/> -.\" Date: 01/31/2019 +.\" Date: 02/01/2019 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MEEK\-CLIENT" "1" "01/31/2019" "\ \&" "\ \&" +.TH "MEEK\-CLIENT" "1" "02/01/2019" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -238,9 +238,12 @@ A global proxy (applies to all Bridge lines) can be configured using special tor .RS 4 .\} .nf -HTTPSProxy localhost:8080 Socks4Proxy localhost:1080 Socks5Proxy localhost:1080 +Socks5ProxyUsername username +Socks5ProxyPassword password +HTTPSProxy localhost:8080 +HTTPSProxyAuthenticator username:password .fi .if n \{\ .RE @@ -248,7 +251,7 @@ Socks5Proxy localhost:1080 .sp or, equivalently, using the \fB\-\-proxy\fR command line option\&. The command line option takes precedence\&. .sp -When the \fB\-\-helper\fR option is used, you can use proxies of type http, socks4a, or socks5\&. Without \fB\-\-helper\fR and with \fButls\fR, you cannot use a proxy\&. Without \fB\-\-helper\fR and without \fButls\fR, you can use proxies of type http, https, or socks5\&. +When the \fB\-\-helper\fR option is used, you can use proxies of type http, socks4a, or socks5, but you cannot use a username or password with the proxy\&. Without \fB\-\-helper\fR, you can use proxies of type http, https, or socks5, and you can optionally use a username and password\&. .SH "OPTIONS" .PP \fB\-\-front\fR=\fIDOMAIN\fR diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt index 89d1265..33e2916 100644 --- a/doc/meek-client.1.txt +++ b/doc/meek-client.1.txt @@ -93,18 +93,20 @@ extension, which must be set up separately. A global proxy (applies to all Bridge lines) can be configured using special torrc options: ---- -HTTPSProxy localhost:8080 Socks4Proxy localhost:1080 Socks5Proxy localhost:1080 +Socks5ProxyUsername username +Socks5ProxyPassword password +HTTPSProxy localhost:8080 +HTTPSProxyAuthenticator username:password ---- or, equivalently, using the **--proxy** command line option. The command line option takes precedence. When the **--helper** option is used, you can use proxies of type -http, socks4a, or socks5. -Without **--helper** and with **utls**, you cannot use a proxy. -Without **--helper** and without **utls**, you can use proxies of type -http, https, or socks5. +http, socks4a, or socks5, but you cannot use a username or password with the proxy. +Without **--helper**, you can use proxies of type +http, https, or socks5, and you can optionally use a username and password. OPTIONS -------