git: Merge branch 'vendor/LIBPCAP'

[Antonio Huete Jimenez]

commit 8df572896d4c54d6c6c5a2fd7214eb5d68fdbd78
Merge: 5062ee702b 97a9217a80
Author: Antonio Huete Jimenez <tuxillo at quantumachine.net>
Date:   Sat Mar 17 08:44:00 2018 -0700

    Merge branch 'vendor/LIBPCAP'
    
    Conflicts:
    	contrib/libpcap/scanner.l

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/8df572896d4c54d6c6c5a2fd7214eb5d68fdbd78


-- 
DragonFly BSD source repository