sync with master

diff --cc ChangeLog
index 8f7a126ba9ff37d9411457d0a4bab8bdabe761dc,5390555aadc657e4bbd2ebfcc8bc23525ab74bbf..0ad70226523af2a080694a3ffc17c29455b070e7
--- 1/ChangeLog
--- 2/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