Merge remote-tracking branch 'origin/master' into topic/seth/stats-improvement

This commit is contained in:
Seth Hall 2016-05-02 14:34:29 -04:00
commit d9d579c52c
416 changed files with 12813 additions and 3278 deletions

View file

@ -21,7 +21,7 @@
// it may fail to match. Work-around: Insert an always
// matching "payload" pattern (not done in snort2bro yet)
// - tcp-state always evaluates to true
// (implemented but deactivated for comparision to Snort)
// (implemented but deactivated for comparison to Snort)
uint32 RuleHdrTest::idcounter = 0;