From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 10 Sep 2015 21:25:41 +0000 (-0400)
Subject: Merge pull request #27 in SNORT/snort3 from cwaxman_buildfixes to master
X-Git-Tag: 3.0.0-233~837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87972c84cdbab2045a5268ea20be9066db7d55d4;p=thirdparty%2Fsnort3.git

Merge pull request #27 in SNORT/snort3 from cwaxman_buildfixes to master

* commit 'a4344c1a6dc04325e2ae57ad84903d882acd8c1a':
  removed control socket defines from cmake. fixed build error with valgrind build option
---

87972c84cdbab2045a5268ea20be9066db7d55d4