Merge remote branch 'origin/master' into topic/seth/ssl-binpac

Conflicts:
	src/bro.bif
This commit is contained in:
Seth Hall 2011-05-23 17:09:41 -04:00
commit 15bfa23ce1
222 changed files with 2711 additions and 1846 deletions

View file

@ -262,6 +262,8 @@ extern int record_all_packets;
extern RecordType* script_id;
extern TableType* id_table;
extern StringVal* cmd_line_bpf_filter;
// Initializes globals that don't pertain to network/event analysis.
extern void init_general_global_var();