Merge pull request #1 from m-lab/master

merge changes from mbm
Merge remote-tracking branch 'upstream/master'
updated third-party/m-lab
FreeBSD changes
Merge pull request #2 from stephenstuart/master

FreeBSD fix for cbr.cc