Merge branch 'topic/robin/dynamic-plugins-2.3' of git.bro.org:bro into topic/robin/dynamic-plugins-2.3

This commit is contained in:
Robin Sommer 2014-06-18 14:41:40 -07:00
commit 62d07a3fc4
131 changed files with 5188 additions and 899 deletions

View file

@ -1260,6 +1260,10 @@ int main(int argc, char** argv)
sqlite3_shutdown();
ERR_free_strings();
EVP_cleanup();
CRYPTO_cleanup_all_ex_data();
// Close files after net_delete(), because net_delete()
// might write to connection content files.
BroFile::CloseCachedFiles();