Update meek-client.1 with uTLS proxy support. (e4bc7b1c) · Commits · The Tor Project / Anti-censorship / Pluggable Transports / meek

doc/meek-client.1

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2,12 +2,12 @@
	.\" Title: meek-client		.\" Title: meek-client
	.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]		.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
	.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>		.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
	.\" Date: 01/31/2019		.\" Date: 02/01/2019
	.\" Manual: \ \&		.\" Manual: \ \&
	.\" Source: \ \&		.\" Source: \ \&
	.\" Language: English		.\" Language: English
	.\"		.\"
	.TH "MEEK\-CLIENT" "1" "01/31/2019" "\ \&" "\ \&"		.TH "MEEK\-CLIENT" "1" "02/01/2019" "\ \&" "\ \&"
	.\" -----------------------------------------------------------------		.\" -----------------------------------------------------------------
	.\" * Define some portability stuff		.\" * Define some portability stuff
	.\" -----------------------------------------------------------------		.\" -----------------------------------------------------------------
	@@ -238,9 +238,12 @@ A global proxy (applies to all Bridge lines) can be configured using special tor
	.RS 4		.RS 4
	.\}		.\}
	.nf		.nf
	HTTPSProxy localhost:8080
	Socks4Proxy localhost:1080		Socks4Proxy localhost:1080
	Socks5Proxy localhost:1080		Socks5Proxy localhost:1080
			Socks5ProxyUsername username
			Socks5ProxyPassword password
			HTTPSProxy localhost:8080
			HTTPSProxyAuthenticator username:password
	.fi		.fi
	.if n \{\		.if n \{\
	.RE		.RE
	@@ -248,7 +251,7 @@ Socks5Proxy localhost:1080
	.sp		.sp
	or, equivalently, using the \fB\-\-proxy\fR command line option\&. The command line option takes precedence\&.		or, equivalently, using the \fB\-\-proxy\fR command line option\&. The command line option takes precedence\&.
	.sp		.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"		.SH "OPTIONS"
	.PP		.PP
	\fB\-\-front\fR=\fIDOMAIN\fR		\fB\-\-front\fR=\fIDOMAIN\fR

doc/meek-client.1.txt

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -93,18 +93,20 @@ extension, which must be set up separately.
	A global proxy (applies to all Bridge lines)		A global proxy (applies to all Bridge lines)
	can be configured using special torrc options:		can be configured using special torrc options:
	----		----
	HTTPSProxy localhost:8080
	Socks4Proxy localhost:1080		Socks4Proxy localhost:1080
	Socks5Proxy localhost:1080		Socks5Proxy localhost:1080
			Socks5ProxyUsername username
			Socks5ProxyPassword password
			HTTPSProxy localhost:8080
			HTTPSProxyAuthenticator username:password
	----		----
	or, equivalently, using the --proxy command line option.		or, equivalently, using the --proxy command line option.
	The command line option takes precedence.		The command line option takes precedence.

	When the --helper option is used, you can use proxies of type		When the --helper option is used, you can use proxies of type
	http, socks4a, or socks5.		http, socks4a, or socks5, but you cannot use a username or password with the proxy.
	Without --helper and with utls, you cannot use a proxy.		Without --helper, you can use proxies of type
	Without --helper and without utls, you can use proxies of type		http, https, or socks5, and you can optionally use a username and password.
	http, https, or socks5.

	OPTIONS		OPTIONS
	-------		-------