Merge remote-tracking branch 'origin/master' into topic/robin/dynamic-plugins-2.3

This commit is contained in:
Robin Sommer 2014-06-13 08:27:10 -07:00
commit ba7af428a7
133 changed files with 3382 additions and 1381 deletions

View file

@ -1247,6 +1247,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();