Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 2 insertions, 2 deletions

diff --git a/version.h b/version.h
index 93e6a0b7c..082a69b57 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: version.h,v 1.39 2003/09/16 21:02:40 markus Exp $ */
+/* $OpenBSD: version.h,v 1.40 2004/02/23 15:16:46 markus Exp $ */
 
 #ifndef SSH_VERSION
-#define SSH_VERSION     "OpenSSH_3.7.1p2"
+#define SSH_VERSION     "OpenSSH_3.8p1"
 #endif /* SSH_VERSION */