Land Recent QUIC changes.

net/quic/crypto/crypto_server_config.h

Index: net/quic/crypto/crypto_server_config.h
diff --git a/net/quic/crypto/crypto_server_config.h b/net/quic/crypto/crypto_server_config.h
index f4816b69048725075ec13ce9898f149c66a018b0..651e928c29113d967a63c478d1f45cdd051a5358 100644
--- a/net/quic/crypto/crypto_server_config.h
+++ b/net/quic/crypto/crypto_server_config.h
@@ -58,6 +58,9 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
     // id contains the server config id for the resulting config. If empty, a
     // random id is generated.
     std::string id;
+    // orbit contains the kOrbitSize bytes of the orbit value for the server
+    // config. If |orbit| is empty then a random orbit is generated.
+    std::string orbit;
   };
 
   // |source_address_token_secret|: secret key material used for encrypting and