Robin Sommer e050648621 Merge branch 'topic/robin/file-analysis-merge' ... Closes #982. * topic/robin/file-analysis-merge: (64 commits) A few more small tweaks. Various smalle tweaks in preparation for merging. FileAnalysis: load custom mime magic database just once. Improve a libmagic-related error message. FileAnalysis: add is_orig field to fa_file & Info. FileAnalysis: inlined doc fixes. FileAnalysis: optimizate connection set updating. FileAnalysis: optimize file handle construction. FileAnalysis: workarounds for older libmagics. FileAnalysis: add custom libmagic database. FileAnalysis: change terminology s/action/analyzer FileAnalysis: libmagic tweaks. FileAnalysis: add bif for setting timeout interval FileAnalysis: add more params to some events. FileAnalysis: insert explicit event queue flush points. FileAnalysis: remove some file events. FileAnalysis: finish switching hooks to events. FileAnalysis: checkpoint in middle of big reorganization. FileAnalysis: fix file type canonification for file_analysis.log Revert "FileAnalysis: optimize get_file_handle event queueing." ... Conflicts: NEWS		2013-05-15 15:14:21 -07:00
..
frameworks	Merge branch 'topic/robin/file-analysis-merge'	2013-05-15 15:14:21 -07:00
misc	Merge remote-tracking branch 'origin/fastpath'	2012-12-14 14:34:51 -08:00
protocols	Merge branch 'master' into topic/jsiwek/file-analysis	2013-05-06 10:21:16 -05:00
utils	Layout tweaks for the sumstats code, and preliminary updates for NEWS.	2013-04-28 15:35:21 -07:00
init-bare.bro	FileAnalysis: add is_orig field to fa_file & Info.	2013-04-23 10:50:43 -05:00
init-default.bro	SumStats tests pass.	2013-04-15 15:28:11 -04:00