Squashed 'libs/libhtp/' changes from bd95df8..371188f

371188f test_hybrid.cpp: Fix bug where a data structure was allocated on the stack but a pointer to it was retained beyond function return.
8cbb0da Revert "test_hybrid.cpp: Fix crashing test due to NULL timeval (see below)."
5547ef6 test_hybrid.cpp: Fix crashing test due to NULL timeval (see below).

git-subtree-dir: libs/libhtp
git-subtree-split: 371188f5c1d99c66635c2bda0e15908644a6810e
Merge commit '0911a7adb1589b8f273f9b74af6d7c629b37d12c' into 0.7.x