From f78c697fa0529ae4f9baed134f2e3caef6023d83 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Thu, 29 Nov 2018 10:03:33 -0600
Subject: [PATCH] Release 2.6

---
 CHANGES     | 4 ++++
 VERSION     | 2 +-
 aux/bro-aux | 2 +-
 aux/broker  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3cadcde147..caaaf03689 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6 | 2018-11-29 10:03:33 -0600
+
+  * Release 2.6.
+
 2.6-beta3-2 | 2018-11-22 07:56:17 -0600
 
   * GH-218: Add missing ICMP router advertisement counterpart (Jon Siwek, Corelight)
diff --git a/VERSION b/VERSION
index 568dfde716..5154b3f68e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-beta3-2
+2.6
diff --git a/aux/bro-aux b/aux/bro-aux
index 7a69c37be9..a0d9d311fa 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 7a69c37be906847fd7921f3febe3a3fc50bda6a6
+Subproject commit a0d9d311fa3f17912d3cabc6ab51a01fd4762535
diff --git a/aux/broker b/aux/broker
index 7efb3069e5..f5af210b8c 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 7efb3069e58c24af282a66542a894100104407ba
+Subproject commit f5af210b8c3192d0372401e86bcaacea0332638d