Merge tag 'upstream/2.7'
[ossec-hids.git] / src / analysisd / makelists.h