Robin Sommer fb848f795d Merge branch 'master' of https://github.com/aaronmbr/bro ... * 'master' of https://github.com/aaronmbr/bro: Copy-paste issue Allow for logging of the VLAN data about a connection in conn.log Save the inner vlan in the Packet object for Q-in-Q setups		2015-07-23 13:05:28 -07:00
..
local-manager.bro	Small updates to the default local.bro.	2012-01-09 13:23:14 -05:00
local-proxy.bro	Small updates to the default local.bro.	2012-01-09 13:23:14 -05:00
local-worker.bro	Updates for the build system and site local scripts for cluster.	2011-08-11 01:32:05 -04:00
local.bro	Merge branch 'master' of https://github.com/aaronmbr/bro	2015-07-23 13:05:28 -07:00