Subject: [quicwg/base-drafts] 68bf99: Cherry-pick from Ekr's WGLC edits

From: Martin Thomson <[email-masked]>
Date: Tue, 14 Jul 2020 15:52:47 -0700

Branch: refs/heads/master
  Home:   https://github.com/quicwg/base-drafts
  Commit: 68bf99ffa5937dbfe80e651e02921852db2b6a64
      https://github.com/quicwg/base-drafts/commit/68bf99ffa5937dbfe80e651e02921852db2b6a64
  Author: Martin Thomson <[email-masked]>
  Date:   2020-07-14 (Tue, 14 Jul 2020)

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

  Log Message:
  -----------
  Cherry-pick from Ekr's WGLC edits

This picks those changes from #3856 that are good that don't conflict
with other changes that are in flight (to the best of my knowledge, that
is).

I've done some additional editorial work around some of these as no
surrounding text is safe when these edits land.

Closes #3856.

  Commit: fc972928fb64f7cd15057a3dc634940e5a40553f
      https://github.com/quicwg/base-drafts/commit/fc972928fb64f7cd15057a3dc634940e5a40553f
  Author: Martin Thomson <[email-masked]>
  Date:   2020-07-15 (Wed, 15 Jul 2020)

  Changed paths:
    M draft-ietf-quic-http.md
    M draft-ietf-quic-invariants.md
    M draft-ietf-quic-recovery.md
    M draft-ietf-quic-tls.md
    M draft-ietf-quic-transport.md

  Log Message:
  -----------
  Merge branch 'master' into cherry-pick-ekr-edit

  Commit: 911c0f9f57119f2843a1118551edc39eb9784025
      https://github.com/quicwg/base-drafts/commit/911c0f9f57119f2843a1118551edc39eb9784025
  Author: Martin Thomson <[email-masked]>
  Date:   2020-07-15 (Wed, 15 Jul 2020)

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

  Log Message:
  -----------
  stream ID not the field

Co-authored-by: Jana Iyengar <[email-masked]>

  Commit: 2eff5d84a4ab21e60c1ea2e6e46d1d63decce8a8
      https://github.com/quicwg/base-drafts/commit/2eff5d84a4ab21e60c1ea2e6e46d1d63decce8a8
  Author: Martin Thomson <[email-masked]>
  Date:   2020-07-15 (Wed, 15 Jul 2020)

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

  Log Message:
  -----------
  Merge pull request #3901 from quicwg/cherry-pick-ekr-edit

Cherry-pick from Ekr's WGLC edits

Compare: https://github.com/quicwg/base-drafts/compare/1b08aa4d0e3d...2eff5d84a4ab