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
..
communication	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
control	Fix typos and formatting in the policy/frameworks docs	2013-10-21 01:23:08 -05:00
dpd	Fix typos and formatting in the policy/frameworks docs	2013-10-21 01:23:08 -05:00
files	Merge branch 'master' into topic/jsiwek/file-signatures	2014-03-24 14:35:37 -05:00
intel	Merge remote-tracking branch 'origin/topic/bernhard/file-analysis-x509'	2014-03-14 09:53:07 -07:00
packet-filter	Fix typos and formatting in the policy/frameworks docs	2013-10-21 01:23:08 -05:00
signatures	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
software	Fix typos and formatting in the policy/frameworks docs	2013-10-21 01:23:08 -05:00