diff --git a/CHANGES b/CHANGES index 5addb633f5..bc04e3fe18 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,18 @@ +2.4-563 | 2016-05-17 16:25:21 -0700 + + * Fix duplication of new_connection_contents event. Addresses + BIT-1602 (Johanna Amann) + + * SMTP: Support SSL upgrade via X-ANONYMOUSTLS This seems to be a + non-standardized microsoft extension that, besides having a + different name, works pretty much the same as StartTLS. We just + treat it as such. (Johanna Amann) + + * Fixing control framework's net_stats and peer_status commands. For + the latter, this removes most of the values returned, as we don't + have access to them anymore. (Robin Sommer) + 2.4-555 | 2016-05-16 20:10:15 -0700 * Fix failing plugin tests on OS X 10.11. (Daniel Thayer) diff --git a/VERSION b/VERSION index 0372b35bee..e55267007d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4-555 +2.4-563 diff --git a/aux/bro-aux b/aux/bro-aux index cb771a3cf5..50d33db5d1 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit cb771a3cf592d46643eea35d206b9f3e1a0758f7 +Subproject commit 50d33db5d12b81187ea127a08903b444a3c4bd04