summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.36.0.txt2
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.36.0.txt b/Documentation/RelNotes/2.36.0.txt
index 8da5b2e..d61ade2 100644
--- a/Documentation/RelNotes/2.36.0.txt
+++ b/Documentation/RelNotes/2.36.0.txt
@@ -397,6 +397,8 @@ Fixes since v2.35
entry it moved.
(merge b7f9130a06 vd/mv-refresh-stat later to maint).
+ * Fix for CVE-2022-24765 has been merged up from 2.35.2 and others.
+
* Other code cleanup, docfix, build fix, etc.
(merge cfc5cf428b jc/find-header later to maint).
(merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1c5f645..9252e04 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.0-rc1
+DEF_VER=v2.36.0-rc2
LF='
'