upstream commit

Reorder client proposal to prefer
 diffie-hellman-group-exchange-sha1 over diffie-hellman-group14-sha1.  ok djm@

Upstream-ID: 552c08d47347c3ee1a9a57d88441ab50abe17058

1 files changed, 3 insertions, 3 deletions

diff --git a/ssh_config.5 b/ssh_config.5
index 844556b56..5758eb811 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.208 2015/04/28 13:47:38 jmc Exp $
-.Dd $Mdocdate: April 28 2015 $
+.\" $OpenBSD: ssh_config.5,v 1.209 2015/05/27 23:51:10 dtucker Exp $
+.Dd $Mdocdate: May 27 2015 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -975,8 +975,8 @@ The default is:
 curve25519-sha256@libssh.org,
 ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
 diffie-hellman-group-exchange-sha256,
-diffie-hellman-group14-sha1,
 diffie-hellman-group-exchange-sha1,
+diffie-hellman-group14-sha1,
 diffie-hellman-group1-sha1
 .Ed
 .Pp