Robin Sommer eed94fab76 Merge remote-tracking branch 'origin/fastpath' ... * origin/fastpath: Correct a notice for heartbleed. The notice is thrown correctly, just the message conteined wrong values. Improve/standardize some malloc/realloc return val checks. Improve file analysis manager shutdown/cleanup.		2014-05-01 09:30:31 -07:00
..
frameworks	Merge branch 'topic/mareq/quoted-printable' of https://github.com/mareq/bro	2014-04-24 18:38:43 -07: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	Merge remote-tracking branch 'origin/fastpath'	2014-05-01 09:30:31 -07:00
tuning	Refactored formatters and updated the the writers a bit.	2014-03-10 10:42:59 -04:00