Jon Siwek bebedcd873 Merge branch 'master' into topic/jsiwek/file-signatures ... Conflicts: scripts/policy/frameworks/files/detect-MHR.bro		2014-03-24 14:35:37 -05:00
..
files	Minor unified2 script documentation fix.	2014-02-03 16:55:23 -06:00
frameworks	Merge branch 'master' into topic/jsiwek/file-signatures	2014-03-24 14:35:37 -05:00
misc	Add script to detect filtered TCP traces, addresses BIT-1119.	2014-01-31 17:04:58 -06:00
protocols	Fix non-deterministic logging of unmatched DNS msgs, addresses BIT-1153	2014-03-10 11:34:57 -05:00
utils	Return the Dir module to file name tracking instead of inode tracking.	2013-10-29 11:09:55 -04:00
init-bare.bro	Merge branch 'master' into topic/jsiwek/file-signatures	2014-03-24 14:35:37 -05:00
init-default.bro	Replace libmagic w/ Bro signatures for file MIME type identification.	2014-03-04 11:12:06 -06:00