Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 23:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into topic/bernhard/file-analysis-x509

Browse source
This commit is contained in:
Bernhard Amann 2014-03-13 00:09:48 -07:00
commit b0c3486fd6
74 changed files with 655 additions and 857 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/NetVar.h
View file

@ -156,8 +156,6 @@ extern int table_incremental_step;
extern RecordType* packet_type;
extern double packet_sort_window;
extern int orig_addr_anonymization, resp_addr_anonymization;
extern int other_addr_anonymization;
extern TableVal* preserve_orig_addr;