summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-04-01 21:45:26 +1000
committerDamien Miller <djm@mindrot.org>2003-04-01 21:45:26 +1000
commit13c1c7a75e523dc6320e1dd1b2affb223f5002f1 (patch)
tree7a749260476727384914f96dd97844e6dd2246c1
parentd32090426bc9ebf6ec982acad029b75a48033175 (diff)
- markus@cvs.openbsd.org 2003/04/01 10:56:46
[version.h] 3.6.1
-rw-r--r--ChangeLog5
-rw-r--r--version.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ffc56696..d5db7b22a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
28 [compat.c compat.h kex.c] 28 [compat.c compat.h kex.c]
29 bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@; 29 bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@;
30 tested by ho@ and myself 30 tested by ho@ and myself
31 - markus@cvs.openbsd.org 2003/04/01 10:56:46
32 [version.h]
33 3.6.1
31 34
3220030326 3520030326
33 - (djm) OpenBSD CVS Sync 36 - (djm) OpenBSD CVS Sync
@@ -1290,4 +1293,4 @@
1290 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1293 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1291 ok provos@ 1294 ok provos@
1292 1295
1293$Id: ChangeLog,v 1.2645 2003/04/01 11:44:37 djm Exp $ 1296$Id: ChangeLog,v 1.2646 2003/04/01 11:45:26 djm Exp $
diff --git a/version.h b/version.h
index 380e35907..75a2b2554 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
1/* $OpenBSD: version.h,v 1.36 2003/03/17 11:43:47 markus Exp $ */ 1/* $OpenBSD: version.h,v 1.37 2003/04/01 10:56:46 markus Exp $ */
2 2
3#define SSH_VERSION "OpenSSH_3.6p1" 3#define SSH_VERSION "OpenSSH_3.6.1p1"