[Bro-Dev] [Auto] Merge Status

[Merge Tracker]

Open Merge Requests
===================

ID            Component    Reporter    Assignee    Updated       For Version  Priority    Summary
------------  -----------  ----------  ----------  ----------  -------------  ----------  -------------------------------------------
BIT-1011 [1]  Bro          nicolas     Seth Hall   2015-02-12            2.4  Low         username/password authentication for SOCKS5


Open GitHub Pull Requests
=========================

Issue    Component    User         Updated     Title
-------  -----------  -----------  ----------  ----------------------------------------------------------
#22 [2]  bro          msmiley [3]  2015-02-10  add local_resp (to complement local_orig) to Conn Info [4]


[1]  BIT-1011                     https://bro-tracker.atlassian.net/browse/BIT-1011
[2]  Pull Request #22             https://github.com/bro/bro/pull/22
[3]  msmiley                      https://github.com/msmiley
[4]  Merge Pull Request #22 with  git pull --no-ff --no-commit https://github.com/msmiley/bro.git master