[tor-commits] [meek/master] Document utls options in meek-client man page.

[dcf at torproject.org]

commit cb5f5978a9168ab05247506cfad37f578a3246c4
Author: David Fifield <david at bamsoftware.com>
Date:   Fri Jan 25 00:25:18 2019 -0700

    Document utls options in meek-client man page.
---
 doc/meek-client.1     | 159 +++++++++++++++++++++++++++++++++++++++++++++++++-
 doc/meek-client.1.txt |  30 ++++++++++
 2 files changed, 187 insertions(+), 2 deletions(-)

diff --git a/doc/meek-client.1 b/doc/meek-client.1
index b379116..58fd755 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: 02/01/2019
+.\"      Date: 02/06/2019
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "MEEK\-CLIENT" "1" "02/01/2019" "\ \&" "\ \&"
+.TH "MEEK\-CLIENT" "1" "02/06/2019" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -54,6 +54,153 @@ Front domain name\&. If provided, this domain name will replace the domain name
 \fBurl\fR
 in the DNS request and TLS SNI field\&. The URL\(cqs true domain name will still appear in the Host header of HTTP requests\&.
 .RE
+.PP
+\fButls\fR=\fICLIENTHELLOID\fR
+.RS 4
+Use the
+uTLS library
+with the named TLS fingerprint for TLS camouflage\&. This arg is incompatible with the
+\fB\-\-helper\fR
+command line option\&. The possible values of
+\fICLIENTHELLOID\fR
+are:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloRandomizedALPN
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloRandomizedNoALPN
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloFirefox_55
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloFirefox_56
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloFirefox_63
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloFirefox_Auto
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloChrome_58
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloChrome_62
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloChrome_70
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloChrome_Auto
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloIOS_11_1
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+HelloIOS_Auto
+.RE
+.sp
+As a special case, the values "none" and "HelloGolang" are recognized as aliases for omitting the
+\fButls\fR
+SOCKS arg; i\&.e\&., use native Go TLS\&.
+.RE
 .sp
 For backward compatibility, each SOCKS arg also has an equivalent command line option\&. For example, this configuration using SOCKS args:
 .sp
@@ -144,6 +291,14 @@ URL to correspond with\&. Prefer using the
 SOCKS arg on a bridge line over using this command line option\&.
 .RE
 .PP
+\fB\-\-utls\fR=\fICLIENTHELLOID\fR
+.RS 4
+Use uTLS with the given TLS fingerprint for TLS camouflage\&. This option is incompatible with
+\fB\-\-helper\fR\&. Prefer using the
+\fButls\fR
+SOCKS arg over using this command line option\&.
+.RE
+.PP
 \fB\-h\fR, \fB\-\-help\fR
 .RS 4
 Display a help message and exit\&.
diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt
index d7883ec..33e2916 100644
--- a/doc/meek-client.1.txt
+++ b/doc/meek-client.1.txt
@@ -43,6 +43,31 @@ The possible SOCKS args are:
     of **url** in the DNS request and TLS SNI field.
     The URL's true domain name will still appear in the Host header
     of HTTP requests.
+**utls**=__CLIENTHELLOID__::
++
+--
+Use the https://github.com/refraction-networking/utls[uTLS library]
+with the named TLS fingerprint for TLS camouflage.
+This arg is incompatible with the **--helper** command line option.
+The possible values of __CLIENTHELLOID__ are:
+
+- HelloRandomizedALPN
+- HelloRandomizedNoALPN
+- HelloFirefox_55
+- HelloFirefox_56
+- HelloFirefox_63
+- HelloFirefox_Auto
+- HelloChrome_58
+- HelloChrome_62
+- HelloChrome_70
+- HelloChrome_Auto
+- HelloIOS_11_1
+- HelloIOS_Auto
+
+As a special case, the values "none" and "HelloGolang"
+are recognized as aliases for
+omitting the **utls** SOCKS arg; i.e., use native Go TLS.
+--
 
 For backward compatibility, each SOCKS arg also has an equivalent
 command line option.
@@ -109,6 +134,11 @@ OPTIONS
     URL to correspond with. Prefer using the **url** SOCKS arg
     on a bridge line over using this command line option.
 
+**--utls**=__CLIENTHELLOID__::
+    Use uTLS with the given TLS fingerprint for TLS camouflage.
+    This option is incompatible with **--helper**.
+    Prefer using the **utls** SOCKS arg over using this command line option.
+
 **-h**, **--help**::
     Display a help message and exit.