Merge branch 'master' into migration-amplification

quicwg · Nov 4, 2020 · fb253e9 · fb253e9
2 parents fb033df + 15858f8
commit fb253e9
Show file tree

Hide file tree

Showing 3 changed files with 767 additions and 640 deletions.
diff --git a/draft-ietf-quic-invariants.md b/draft-ietf-quic-invariants.md
@@ -111,6 +111,9 @@ version of QUIC.
 
 {::boilerplate bcp14}
 
+This document defines requirements on future QUIC versions, even where normative
+language is not used.
+
 This document uses terms and notational conventions from {{QUIC-TRANSPORT}}.
 
 

diff --git a/draft-ietf-quic-recovery.md b/draft-ietf-quic-recovery.md
@@ -632,8 +632,9 @@ in most cases and is less likely to spuriously retransmit data.
 
 Resumed connections over the same network MAY use the previous connection's
 final smoothed RTT value as the resumed connection's initial RTT.  When no
-previous RTT is available, the initial RTT SHOULD be set to 333ms, resulting in
-a 1 second initial timeout, as recommended in {{?RFC6298}}.
+previous RTT is available, the initial RTT SHOULD be set to 333ms.  This
+results in handshakes starting with a PTO of 1 second, as recommended
+for TCP's initial retransmission timeout; see Section 2 of {{?RFC6298}}.
 
 A connection MAY use the delay between sending a PATH_CHALLENGE and receiving a
 PATH_RESPONSE to set the initial RTT (see kInitialRtt in