Master-test merge (Re: [Bro-Commits] [git/bro] master: Merge branch 'topic/robin/master-test' (24aea29))

This has the recent threading changes, plus all other pending merge
requests.

Please test, I hope it doesn't break anything ..

Problems remaining:

    - Occasional tests failures reporting a bad file descriptor on Mac
      OS. Reason still unclear.

    - #start timestamps can be 1969-... when network time is not yet
      set.

    - tuning/logs-to-elasticsearch.bro not loaded by test-all-policy
      because it triggers lock-ups.

Robin

One more: I this occasionally:

scripts.base.frameworks.logging.rotate-custom ... failed
  [...[
  == Diff ===============================
  --- /tmp/test-diff.7552..stderr.baseline.tmp 2012-07-24
  23:03:20.939242086 +0000
  +++ /tmp/test-diff.7552..stderr.tmp 2012-07-24 23:03:20.959242847
  +0000
  @@ -3,7 +3,6 @@
  1st test.2011-03-07-04-00-05.log test 11-03-07_04.00.05
  11-03-07_05.00.05 0 ascii
  1st test.2011-03-07-05-00-05.log test 11-03-07_05.00.05
  11-03-07_06.00.05 0 ascii
  1st test.2011-03-07-06-00-05.log test 11-03-07_06.00.05
  11-03-07_07.00.05 0 ascii
  -1st test.2011-03-07-07-00-05.log test 11-03-07_07.00.05
  11-03-07_08.00.05 0 ascii
  1st test.2011-03-07-08-00-05.log test 11-03-07_08.00.05
  11-03-07_09.00.05 0 ascii
  1st test.2011-03-07-09-00-05.log test 11-03-07_09.00.05
  11-03-07_10.00.05 0 ascii
  1st test.2011-03-07-10-00-05.log test 11-03-07_10.00.05
  11-03-07_11.00.05 0 ascii

I believe I've figured this one out. Commit will come soon.

Robin