Subject: [quicwg/base-drafts] f36dce: Merge crypto timeout into PTO

From: ianswett <[email-masked]>
Date: Fri, 26 Apr 2019 20:27:42 -0700

Branch: refs/heads/ianswett-merge-pto
  Home:   https://github.com/quicwg/base-drafts
  Commit: f36dced5e540fccf60a8a3c3e4d7e263a1bf133a
      https://github.com/quicwg/base-drafts/commit/f36dced5e540fccf60a8a3c3e4d7e263a1bf133a
  Author: ianswett <[email-masked]>
  Date:   2019-04-26 (Fri, 26 Apr 2019)

  Changed paths:
    M draft-ietf-quic-recovery.md

  Log Message:
  -----------
  Merge crypto timeout into PTO

Makes the crypto timeout(including deadlock prevention) a special case of PTO.

Fixes #2650