Seth Hall 0a18b62d12 Merge remote-tracking branch 'origin/master' into topic/seth/sumstats-updates ... Conflicts: scripts/base/frameworks/sumstats/cluster.bro scripts/base/frameworks/sumstats/plugins/average.bro scripts/base/frameworks/sumstats/plugins/max.bro scripts/base/frameworks/sumstats/plugins/min.bro scripts/base/frameworks/sumstats/plugins/sample.bro scripts/base/frameworks/sumstats/plugins/std-dev.bro scripts/base/frameworks/sumstats/plugins/sum.bro scripts/base/frameworks/sumstats/plugins/unique.bro scripts/base/frameworks/sumstats/plugins/variance.bro scripts/policy/protocols/http/detect-sqli.bro testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.bro		2013-05-21 22:33:16 -04:00
..
cluster	s/bro-ids.org/bro.org/g	2013-03-07 19:33:04 -08:00
communication	Merge remote-tracking branch 'vlad/info_record_fixes'	2012-07-13 16:20:49 -07:00
control	Enable Bro to communicate with peers over non-global IPv6 addresses.	2012-05-17 12:59:20 -05:00
dpd	Fixed some problems with the SOCKS analyzer and tests.	2012-06-20 22:57:46 -04:00
file-analysis	FileAnalysis: add is_orig field to fa_file & Info.	2013-04-23 10:50:43 -05:00
input	Merge branch 'topic/robin/sqlite-merge'	2013-05-15 16:03:19 -07:00
intel	Fix some warnings from sphinx when building docs.	2012-11-15 16:40:18 -06:00
logging	Merge remote-tracking branch 'origin/topic/bernhard/thread-cleanup'	2013-05-15 17:16:41 -07:00
notice	Merge remote-tracking branch 'origin/topic/seth/notice-framework-updates'	2013-03-06 16:45:30 -08:00
packet-filter	Checkpoint after pass.	2012-02-15 13:07:08 -08:00
reporter	Change reporter messages to more reliably print to stderr.	2013-01-18 12:46:00 -06:00
signatures	remove the byte_len and length bifs	2013-03-06 13:45:42 -08:00
software	Update software version parsing and comparison to account for a third numeric subversion.	2013-02-06 13:59:05 -05:00
sumstats	Merge remote-tracking branch 'origin/master' into topic/seth/sumstats-updates	2013-05-21 22:33:16 -04:00
tunnels	Add parsing for GTPv1 extension headers and control messages.	2013-02-07 14:59:02 -06:00