snort: Update to 2.9.6.1.
Merge remote-tracking branch 'stevee/snort-update' into next