Commit graph

2 commits

Author SHA1 Message Date
Seth Hall
c070cb31da Merge remote branch 'origin/master' into topic/policy-scripts-new
Conflicts:
	policy/bro.init
	testing/btest/language/rare-events.bro
2011-06-25 23:49:20 -04:00
Seth Hall
62613ec1a0 Moved policy script directory to policy.old 2011-03-01 10:51:44 -05:00
Renamed from policy/netstats.bro (Browse further)