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

Merge remote-tracking branch 'origin/master' into topic/johanna/tls12-decryption

Browse source
This commit is contained in:
Johanna Amann 2022-01-11 11:04:20 +00:00
commit 304a06bb88
36 changed files with 208 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

2
testing/btest/scripts/site/local-compat.test
View file

@ -15,7 +15,7 @@
# # simply update this test's TEST-START-FILE with the latest contents
# site/local.zeek.
@TEST-START-FILE local-4.2.zeek
@TEST-START-FILE local-5.0.zeek
##! Local site policy. Customize as appropriate.
##!
##! This file will not be overwritten when upgrading or reinstalling!