Jon Siwek ec50cad9db Merge branch 'master' into topic/jsiwek/file-analysis ... Conflicts: scripts/base/protocols/ftp/main.bro src/OpaqueVal.h testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log		2013-05-06 10:21:16 -05:00
..
conn	Merge remote-tracking branch 'origin/topic/jsiwek/gridftp'	2012-10-12 10:43:16 -07:00
dns	Fixed a DNS attribute issue (reported by Matt Thompson).	2012-11-26 15:58:25 -05:00
ftp	Merge branch 'master' into topic/jsiwek/file-analysis	2013-05-06 10:21:16 -05:00
http	FileAnalysis: optimize file handle construction.	2013-04-19 11:38:11 -05:00
irc	FileAnalysis: optimize file handle construction.	2013-04-19 11:38:11 -05:00
modbus	Fixing tests after modbus merge.	2012-11-05 15:58:38 -08:00
smtp	FileAnalysis: optimize file handle construction.	2013-04-19 11:38:11 -05:00
socks	Add an error for record coercions that would orphan a field.	2013-01-24 09:56:19 -06:00
ssh	Layout tweaks for the sumstats code, and preliminary updates for NEWS.	2013-04-28 15:35:21 -07:00
ssl	add base64-encode functionality and bif.	2013-03-05 16:05:07 -08:00
syslog	Fix some Info:Record field documentation.	2012-07-13 14:04:24 -04:00