Bug 1088590 - Add a timeout for retries. r=nthomas,r=catlee