Merge branch 'master' into topic/jsiwek/gh-320

This commit is contained in:
Seth Hall 2019-06-26 14:47:01 -04:00 committed by GitHub
commit eb690a18cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3266 changed files with 87729 additions and 103138 deletions

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -C -r $TRACES/rfb/vncmac.pcap
# @TEST-EXEC: zeek -C -r $TRACES/rfb/vncmac.pcap
# @TEST-EXEC: btest-diff rfb.log
@load base/protocols/rfb

View file

@ -1,4 +1,4 @@
# @TEST-EXEC: bro -C -r $TRACES/rfb/vnc-mac-to-linux.pcap
# @TEST-EXEC: zeek -C -r $TRACES/rfb/vnc-mac-to-linux.pcap
# @TEST-EXEC: btest-diff rfb.log
@load base/protocols/rfb