Robin Sommer 984e9793db Merge remote-tracking branch 'origin/topic/seth/faf-updates' ... * origin/topic/seth/faf-updates: (27 commits) Undoing the FTP tests I updated earlier. Update the last two btest FAF tests. File analysis fixes and test updates. Fix a bug with getting analyzer tags. A few test updates. Some tests work now (at least they all don't fail anymore!) Forgot a file. Added protocol description functions that provide a super compressed log representation. Fix a bug where orig file information in http wasn't working right. Added mime types to http.log Clean up queued but unused file_over_new_connections event args. Add jar files to the default MHR lookups. Adding CAB files for MHR checking. Improve malware hash registry script. Fix a small issue with finding smtp entities. Added support for files to the notice framework. Make the custom libmagic database a git submodule. Add an is_orig parameter to file_over_new_connection event. Make magic for emitting application/msword mime type less strict. Disable more libmagic builtin checks that override the magic database. ... Conflicts: doc/scripts/DocSourcesList.cmake scripts/base/init-bare.bro scripts/test-all-policy.bro testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log		2013-07-29 14:21:52 -07:00
..
__load__.bro	Merge remote-tracking branch 'origin/topic/seth/bittorrent-fix-and-dpd-sig-breakout' into topic/seth/faf-updates	2013-07-10 16:28:38 -04:00
dpd.sig	Added a missing curly brace in smtp/dpd.sig	2013-07-09 22:57:36 -04:00
entities.bro	Merge remote-tracking branch 'origin/topic/seth/faf-updates'	2013-07-29 14:21:52 -07:00
files.bro	Added protocol description functions that provide a super compressed log representation.	2013-07-16 12:01:50 -04:00
main.bro	Merge remote-tracking branch 'origin/topic/seth/faf-updates'	2013-07-29 14:21:52 -07:00