Set version numbers to 3.85 finalNSS_3_85_RTM

4 files changed, 26 insertions, 11 deletions

diff --git a/doc/rst/releases/index.rst b/doc/rst/releases/index.rst
index 7abe1f1fb..46c0b9419 100644
--- a/doc/rst/releases/index.rst
+++ b/doc/rst/releases/index.rst
@@ -8,6 +8,7 @@ Releases
    :glob:
    :hidden:
 
+   nss_3_85.rst
    nss_3_84.rst
    nss_3_83.rst
    nss_3_82.rst
@@ -43,8 +44,8 @@ Releases
 
 .. note::
 
-   **NSS 3.84** is the latest version of NSS.
-   Complete release notes are available here: :ref:`mozilla_projects_nss_nss_3_84_release_notes`
+   **NSS 3.85** is the latest version of NSS.
+   Complete release notes are available here: :ref:`mozilla_projects_nss_nss_3_85_release_notes`
 
    **NSS 3.79.2** is the latest ESR version of NSS.
    Complete release notes are available here: :ref:`mozilla_projects_nss_nss_3_79_2_release_notes`
@@ -52,7 +53,21 @@ Releases
 
 .. container::
 
-   Changes in 3.84 included in this release:
+   Changes in 3.85 included in this release:
 
-   - Bug 1791699 - Bump minimum NSPR version to 4.35.
-   - Bug 1792103 - Add a flag to disable building libnssckbi.
+   - Bug 1792821 - Modification of the primes.c and dhe-params.c in order to have better looking tables.
+   - Bug 1796815 - Update zlib in NSS to 1.2.13.
+   - Bug 1796504 - Skip building modutil and shlibsign when building in Firefox.
+   - Bug 1796504 - Use __STDC_VERSION__ rather than __STDC__ as a guard. 
+   - Bug 1796407 - Fix -Wunused-but-set-variable warning from clang 15.
+   - Bug 1796308 - Fix -Wtautological-constant-out-of-range-compare and -Wtype-limits warnings. 
+   - Bug 1796281 - Followup: add missing stdint.h include.
+   - Bug 1796281 - Fix -Wint-to-void-pointer-cast warnings.
+   - Bug 1796280 - Fix -Wunused-{function,variable,but-set-variable} warnings on Windows.
+   - Bug 1796079 - Fix -Wstring-conversion warnings.
+   - Bug 1796075 - Fix -Wempty-body warnings.
+   - Bug 1795242 - Fix unused-but-set-parameter warning.
+   - Bug 1795241 - Fix unreachable-code warnings.
+   - Bug 1795222 - Mark _nss_version_c unused on clang-cl.
+   - Bug 1795668 - Remove redundant variable definitions in lowhashtest.
+   - No bug - Add note about python executable to build instructions.
\ No newline at end of file
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index 105544f25..dcbbd1cda 100644
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -22,12 +22,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.85" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.85" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
 #define NSS_VMINOR 85
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
-#define NSS_BETA PR_TRUE
+#define NSS_BETA PR_FALSE
 
 #ifndef RC_INVOKED
 
diff --git a/lib/softoken/softkver.h b/lib/softoken/softkver.h
index 31fe44869..b84ef4611 100644
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -17,11 +17,11 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.85" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.85" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
 #define SOFTOKEN_VMINOR 85
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_TRUE
+#define SOFTOKEN_BETA PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/lib/util/nssutil.h b/lib/util/nssutil.h
index cfc0326e4..b0d4a2a3d 100644
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.85 Beta"
+#define NSSUTIL_VERSION "3.85"
 #define NSSUTIL_VMAJOR 3
 #define NSSUTIL_VMINOR 85
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_TRUE
+#define NSSUTIL_BETA PR_FALSE
 
 SEC_BEGIN_PROTOS