Bernhard Amann b8ad4567fb Merge branch 'topic/bernhard/reader-info' into topic/bernhard/sqlite ... Now uses optional dbname configuration option Conflicts: scripts/base/frameworks/logging/__load__.bro src/logging.bif		2012-07-02 10:13:54 -07:00
..
frameworks	Merge branch 'topic/bernhard/reader-info' into topic/bernhard/sqlite	2012-07-02 10:13:54 -07:00
misc	Hopefully the last major script reorganization.	2011-08-05 23:09:53 -04:00
protocols	Merge remote-tracking branch 'origin/topic/seth/tunnels-merge'	2012-06-21 10:12:43 -07:00
utils	Add support to Bro for connecting with peers over IPv6.	2012-05-09 15:08:36 -05:00
init-bare.bro	Fixed some problems with the SOCKS analyzer and tests.	2012-06-20 22:57:46 -04:00
init-default.bro	Return of Robin's old SOCKS analyzer/decapsulator and tunnel code checkpoint.	2012-04-21 23:50:09 -04:00