Merge pull request #221 from InfoHunter/8.3-stable

同步master的文档和CHANGES到8.3-stable
Tongsuo-Project · Apr 1, 2022 · 9330b9d · 9330b9d
2 parents bec8ae2 + 6e9aef7
commit 9330b9d
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 14,542 deletions.
diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS
diff --git a/AUTHORS b/AUTHORS
diff --git a/CHANGES b/CHANGES
diff --git a/CHANGES.BabaSSL → CHANGES.en b/CHANGES.BabaSSL → CHANGES.en
@@ -5,12 +5,14 @@
  This is a high-level summary of the most important changes.
  For a full list of changes, see the git commit log.
 
- Changes between 8.3.0 and 8.3.1 [xx XXX xxxx]
+ Changes between 8.3.0 and 8.4.0 [xx XXX xxxx]
 
   *)
 
   *) Fix bugs in SM2 implementation [0x9527-zhou]
 
+  *) Remove Camellia
+
   *) Fix CVE-2022-0778
 
  Changes between 8.2.0 and 8.3.0 [28 Feb 2022]

diff --git a/CONTRIBUTING b/CONTRIBUTING
diff --git a/FAQ b/FAQ
diff --git a/LEGAL.md b/LEGAL.md