Seth Hall eeb8c0cbb0 Merge branch 'topic/seth/intel-update-merge' ... Closes github's #77 and closes BIT-1606 * topic/seth/intel-update-merge: Tiny scoping updates and test baseline updates for Intel framework. Minor documentation cleanups. Fixed insertion of nested subnets. Refactored FAF integration of intel framework. Added expiration for intelligence items. Improved intel notices. Added hook to allow extending the intel log. Added remove function to intel-framework. Added support for subnets to intel-framework. Refactoring of meta data handling for intel. Added testcase for intel updates.		2016-08-05 09:36:52 -04:00
..
files	Fix parsing of x509 pre-y2k dates	2016-04-26 12:30:28 -07:00
frameworks	Merge branch 'topic/jgras/intel-update' of https://github.com/J-Gras/bro into topic/seth/intel-update-merge	2016-08-02 15:50:43 -04:00
misc	Merge remote-tracking branch 'origin/topic/jsiwek/tcp-improvements'	2014-02-04 22:34:35 -08:00
protocols	Merge remote-tracking branch 'origin/topic/robin/bit-1641'	2016-08-02 15:28:31 -07:00
utils	Updates for the urls.bro script. Fixes BIT-1404.	2015-06-01 11:38:26 -04:00