Robin Sommer 9efb549236 Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures' ... * origin/topic/jsiwek/file-signatures: File type detection changes and fix https.log {orig,resp}_fuids fields. Various minor changes related to file mime type detection. Refactor common MIME magic matching code. Replace libmagic w/ Bro signatures for file MIME type identification. Conflicts: scripts/base/init-default.bro testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log BIT-1143 #merged		2014-03-30 22:51:05 +02:00
..
frameworks	Merge remote-tracking branch 'origin/topic/jsiwek/file-signatures'	2014-03-30 22:51:05 +02:00
integration	Add more script package README files	2013-10-22 14:44:59 -05:00
misc	Merge branch 'topic/robin/event-dumper'	2013-12-04 12:13:07 -08:00
protocols	Add policy script to suppress non host-certificate logging in x509.log	2014-03-19 21:32:01 -07:00
tuning	Refactored formatters and updated the the writers a bit.	2014-03-10 10:42:59 -04:00