upstream commit

openssh 7.0; ok deraadt@

Upstream-ID: c63afdef537f57f28ae84145c5a8e29e9250221f

diff --git a/version.h b/version.h
index b58fbe1ebce6292789b3b032bff9995348da1d4b..7a5dbc8a2300b4f9065b83df0380092ee0e8c1c1 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.73 2015/07/01 01:55:13 djm Exp $ */
+/* $OpenBSD: version.h,v 1.74 2015/08/02 09:56:42 djm Exp $ */
 
-#define SSH_VERSION    "OpenSSH_6.9"
+#define SSH_VERSION    "OpenSSH_7.0"
 
 #define SSH_PORTABLE   "p1"
 #define SSH_RELEASE    SSH_VERSION SSH_PORTABLE