1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
Author: mpostaire <maxime_postaire@hotmail.fr>
Description: Add the UseMPTCP config option to the manpages.
https://github.com/openssh/openssh-portable/pull/335
diff --git a/scp.1 b/scp.1
index 2e96e201..4e941a37 100644
--- a/scp.1
+++ b/scp.1
@@ -219,6 +219,7 @@ For full details of the options listed below, and their possible values, see
.It StrictHostKeyChecking
.It TCPKeepAlive
.It UpdateHostKeys
+.It UseMPTCP
.It User
.It UserKnownHostsFile
.It VerifyHostKeyDNS
diff --git a/sftp.1 b/sftp.1
index 39e7d6ed..291dbf60 100644
--- a/sftp.1
+++ b/sftp.1
@@ -278,6 +278,7 @@ For full details of the options listed below, and their possible values, see
.It StrictHostKeyChecking
.It TCPKeepAlive
.It UpdateHostKeys
+.It UseMPTCP
.It User
.It UserKnownHostsFile
.It VerifyHostKeyDNS
diff --git a/ssh.1 b/ssh.1
index b4956aec..a81c3008 100644
--- a/ssh.1
+++ b/ssh.1
@@ -584,6 +584,7 @@ For full details of the options listed below, and their possible values, see
.It Tunnel
.It TunnelDevice
.It UpdateHostKeys
+.It UseMPTCP
.It User
.It UserKnownHostsFile
.It VerifyHostKeyDNS
diff --git a/ssh_config.5 b/ssh_config.5
index 24a46460..56094449 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -1930,6 +1930,12 @@ Presently, only
from OpenSSH 6.8 and greater support the
.Qq hostkeys@openssh.com
protocol extension used to inform the client of all the server's hostkeys.
+.It Cm UseMPTCP
+If set to
+.Cm yes ,
+this will enable Multipath TCP (MPTCP) instead of TCP (this only works on Linux).
+The default is
+.Cm no .
.It Cm User
Specifies the user to log in as.
This can be useful when a different user name is used on different machines.
diff --git a/sshd_config.5 b/sshd_config.5
index 867a747d..6c2dd1f7 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -1752,6 +1752,12 @@ and
.Cm Match
.Cm Host
directives.
+.It Cm UseMPTCP
+If set to
+.Cm yes ,
+this will enable Multipath TCP (MPTCP) instead of TCP (this only works on Linux).
+The default is
+.Cm no .
.It Cm UsePAM
Enables the Pluggable Authentication Module interface.
If set to
|
