Merge branch 'master' of ssh://git.bro-ids.org/bro

This commit is contained in:
Seth Hall 2013-08-28 00:58:03 -04:00
commit 0592b528ef
113 changed files with 21084 additions and 20859 deletions

View file

@ -3080,6 +3080,10 @@ const snaplen = 8192 &redef;
## instances. If left unset, Bro will use a temporary local seed.
const global_hash_seed: string = "" &redef;
## Number of bits in UIDs that are generated to identify connections and
## files. The larger the value, the more confidence in UID uniqueness.
const bits_per_uid: count = 96 &redef;
# Load BiFs defined by plugins.
@load base/bif/plugins