Merge branch 'master' into topic/jsiwek/file-analysis

This commit is contained in:
Jon Siwek 2013-03-11 13:20:45 -05:00
commit 1f6cac9b6d
37 changed files with 114 additions and 225 deletions

View file

@ -39,7 +39,7 @@ export {
## The node type doing all the actual traffic analysis.
WORKER,
## A node acting as a traffic recorder using the
## `Time Machine <http://tracker.bro-ids.org/time-machine>`_ software.
## `Time Machine <http://tracker.bro.org/time-machine>`_ software.
TIME_MACHINE,
};