From: Russ Combs <rucombs@cisco.com>
Date: Tue, 30 Sep 2014 18:00:46 +0000 (-0400)
Subject: sync with master
X-Git-Tag: 3.0.0-233~1398^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d33e931dc014bcd920238cc7d028234ac8f23338;p=thirdparty%2Fsnort3.git

sync with master
---

d33e931dc014bcd920238cc7d028234ac8f23338
diff --cc ChangeLog
index 8f7a126ba,5390555aa..0ad702265
--- a/ChangeLog
+++ b/ChangeLog
@@@ -8,7 -8,8 +8,9 @@@
  -- more refactoring of tcp session - still incomplete
  -- patched cd_tcp.cc and packet_manager.cc for length underflow issue
  -- fix active.max_responses default, etc.
 +-- always change both directions to atom splitter
+ -- fixed byte_extract leak, session flow data leak
+ -- changed pcre JIT to be optional by #define; need autofoo
  
  121
  -- valgrind fixes