Merge with Subversion repository as of r7137. Incorporated change:

* Fix for packet processing resumption when a remote Bro dies
      during state synchronization (Robin Sommer).
This commit is contained in:
Robin Sommer 2010-12-08 04:10:26 -08:00
parent c690a8b2f3
commit dc5d3560f7
3 changed files with 22 additions and 3 deletions

View file

@ -1 +1 @@
1.6-dev.2
1.6-dev.3