[osquery:master] 1 new commit by Teddy Reed:

<https://github.com/osquery/osquery/commit/dfaea4ddd8ac00b49979ba8f3c9085201ab2cc38|dfaea4d>

Restore thrift socket 5min timeout (#7072) - Teddy Reed