From 43ecece5952d1c8c649d541863fcef31760d07f5 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Thu, 5 Dec 2002 21:50:13 +0000
Subject: [PATCH] Merge in relevant changes from the OpenSSL 0.9.6h release.

---
 CHANGES | 2 +-
 FAQ     | 2 +-
 STATUS  | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index ce2c1264a9..8d47c0e171 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2119,7 +2119,7 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
   *) Clean old EAY MD5 hack from e_os.h.
      [Richard Levitte]
 
- Changes between 0.9.6g and 0.9.6h  [xx XXX xxxx]
+ Changes between 0.9.6g and 0.9.6h  [5 Dec 2002]
 
   *) New function OPENSSL_cleanse(), which is used to cleanse a section of
      memory from it's contents.  This is done with a counter that will
diff --git a/FAQ b/FAQ
index 24f4de7727..2867ed0d36 100644
--- a/FAQ
+++ b/FAQ
@@ -66,7 +66,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?
 
 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.6g was released on August 9, 2002.
+OpenSSL 0.9.6h was released on December 5, 2002.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
diff --git a/STATUS b/STATUS
index 0d7707d0b6..f50d4fd2bc 100644
--- a/STATUS
+++ b/STATUS
@@ -1,6 +1,6 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/11/21 22:39:08 $
+  ______________                           $Date: 2002/12/05 21:50:13 $
 
   DEVELOPMENT STATE
 
@@ -10,6 +10,7 @@
     o  OpenSSL 0.9.7-beta3: Released on July 30th, 2002
     o  OpenSSL 0.9.7-beta2: Released on June 16th, 2002
     o  OpenSSL 0.9.7-beta1: Released on June  1st, 2002
+    o  OpenSSL 0.9.6h: Released on December   5th, 2002
     o  OpenSSL 0.9.6g: Released on August     9th, 2002
     o  OpenSSL 0.9.6f: Released on August     8th, 2002
     o  OpenSSL 0.9.6e: Released on July      30th, 2002
-- 
2.25.1