4 commits

Author	SHA1	Message	Date
Daniel Thayer	475682ba7f	Fix minor typos in documentation ... Some of these fixes are for broken links in the auto-generated docs.	2016-11-14 09:50:19 -06:00
Daniel Thayer	28f4d45d33	Fix potential race condition when logging VLAN info to conn.log ... Lowered priority of a connection_state_remove event handler to ensure that the "conn" field is initialized in the connection record before attempting to add the VLAN tags.	2015-11-05 12:14:05 -06:00
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
Aaron Brown	f29dbb90a5	Allow for logging of the VLAN data about a connection in conn.log	2015-07-22 14:13:17 -04:00