From a7d55f8da2c47bf8b3de2524b24e1d8bfec1c2ce Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Tue, 22 Nov 2022 08:43:16 -0700
Subject: [PATCH] Update CHANGES, VERSION, and NEWS for 2.3.5 release

---
 CHANGES                   | 12 ++++++++++++
 NEWS                      |  8 ++++++++
 VERSION                   |  2 +-
 include/broker/version.hh |  4 ++--
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index d4c00cfa..9938d491 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2.3.5 | 2022-11-22 08:44:02 -0700
+
+  * Update CHANGES, VERSION, and NEWS for 2.3.5 release (Tim Wojtulewicz, Corelight)
+
+  * Add clangd .cache directory to gitignore (Tim Wojtulewicz, Corelight)
+
+  * Windows CI: make Dockerfile a little more like one in Zeek (Tim Wojtulewicz, Corelight)
+
+    - Install choco in a much less-verbose way
+    - Use choco to install VS build tools and git
+
+
 2.3.3-9 | 2022-11-17 08:49:45 -0700
 
   * Fix clang-tidy warnings (Dominik Charousset, Corelight)
diff --git a/NEWS b/NEWS
index 6f74dff7..e73561e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Broker 2.3.5
+============
+
+- Fix Windows CI builds (Tim Wojtulewicz, Corelight)
+
+- Fix a potential stall in Broker’s internal data pipeline (Dominik Charousset,
+  Corelight)
+
 Broker 2.3.4
 ============
 
diff --git a/VERSION b/VERSION
index 5135371b..cc6c9a49 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.3-9
+2.3.5
diff --git a/include/broker/version.hh b/include/broker/version.hh
index 418a5b64..0e0e96c9 100644
--- a/include/broker/version.hh
+++ b/include/broker/version.hh
@@ -9,8 +9,8 @@ using type = unsigned;
 
 constexpr type major = 2;
 constexpr type minor = 3;
-constexpr type patch = 3;
-constexpr auto suffix = "-9";
+constexpr type patch = 5;
+constexpr auto suffix = "";
 
 constexpr type protocol = 2;