[Box Backup-commit] [boxbackup/boxbackup] ed55e2: Merge branch 'master' into windows_binary_packages

[GitHub]

  Branch: refs/heads/windows_binary_packages
  Home:   https://github.com/boxbackup/boxbackup
  Commit: ed55e2b11107a04ad49950d5cf1b2ba7291d3344
      https://github.com/boxbackup/boxbackup/commit/ed55e2b11107a04ad49950d5cf1b2ba7291d3344
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M bin/bbstored/bbstored-certs.in
    M lib/bbackupd/BackupDaemon.cpp
    M lib/common/Timer.cpp
    M lib/common/Timer.h
    M test/common/testcommon.cpp

  Log Message:
  -----------
  Merge branch 'master' into windows_binary_packages