From 8a0b9b3b9e61d3cfb0cab8f7e8c4e7c80d5cde10 Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lucas@clemente.io>
Date: Sun, 4 Sep 2016 23:33:03 +0200
Subject: [PATCH 1/2] use chrome dev in integration tests for testing v36

---
 integrationtests/integrationtests_suite_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/integrationtests/integrationtests_suite_test.go b/integrationtests/integrationtests_suite_test.go
index 6504c78d8..1dd2006f1 100644
--- a/integrationtests/integrationtests_suite_test.go
+++ b/integrationtests/integrationtests_suite_test.go
@@ -152,7 +152,7 @@ func setupQuicServer() {
 
 func setupSelenium() {
 	var err error
-	pullCmd := exec.Command("docker", "pull", "lclemente/standalone-chrome:beta")
+	pullCmd := exec.Command("docker", "pull", "lclemente/standalone-chrome:dev")
 	pull, err := gexec.Start(pullCmd, GinkgoWriter, GinkgoWriter)
 	Expect(err).NotTo(HaveOccurred())
 	// Assuming a download at 10 Mbit/s
@@ -165,7 +165,7 @@ func setupSelenium() {
 		"--rm",
 		"-p=4444:4444",
 		"--name", "quic-test-selenium",
-		"lclemente/standalone-chrome:beta",
+		"lclemente/standalone-chrome:dev",
 	)
 	docker, err = gexec.Start(dockerCmd, GinkgoWriter, GinkgoWriter)
 	Expect(err).NotTo(HaveOccurred())

From 5ffc2f539de66b80bbcad0055f3859921dcfbf16 Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lucas@clemente.io>
Date: Fri, 2 Sep 2016 15:14:20 +0200
Subject: [PATCH 2/2] add support for version 36

fixes #312
---
 README.md                | 2 +-
 h2quic/server_test.go    | 2 +-
 protocol/version.go      | 3 ++-
 protocol/version_test.go | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7a2b4b262..93fe544fd 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ quic-go is an implementation of the [QUIC](https://en.wikipedia.org/wiki/QUIC) p
 
 Done:
 
-- Basic protocol with support for QUIC version 34-35
+- Basic protocol with support for QUIC version 34-36
 - HTTP/2 support
 - Crypto (RSA / ECDSA certificates, Curve25519 for key exchange, AES-GCM or Chacha20-Poly1305 as stream cipher)
 - Loss detection and retransmission (currently fast retransmission & RTO)
diff --git a/h2quic/server_test.go b/h2quic/server_test.go
index abc538b29..12b883654 100644
--- a/h2quic/server_test.go
+++ b/h2quic/server_test.go
@@ -196,7 +196,7 @@ var _ = Describe("H2 server", func() {
 
 	Context("setting http headers", func() {
 		expected := http.Header{
-			"Alt-Svc":            {`quic=":443"; ma=2592000; v="35,34"`},
+			"Alt-Svc":            {`quic=":443"; ma=2592000; v="36,35,34"`},
 			"Alternate-Protocol": {`443:quic`},
 		}
 
diff --git a/protocol/version.go b/protocol/version.go
index db645a3cf..cd0cd475e 100644
--- a/protocol/version.go
+++ b/protocol/version.go
@@ -13,12 +13,13 @@ type VersionNumber int
 const (
 	Version34 VersionNumber = 34 + iota
 	Version35
+	Version36
 	VersionWhatever = 0 // for when the version doesn't matter
 )
 
 // SupportedVersions lists the versions that the server supports
 var SupportedVersions = []VersionNumber{
-	Version34, Version35,
+	Version34, Version35, Version36,
 }
 
 // SupportedVersionsAsTags is needed for the SHLO crypto message
diff --git a/protocol/version_test.go b/protocol/version_test.go
index 8596354f6..5bcd4a456 100644
--- a/protocol/version_test.go
+++ b/protocol/version_test.go
@@ -17,11 +17,11 @@ var _ = Describe("Version", func() {
 	})
 
 	It("has proper tag list", func() {
-		Expect(SupportedVersionsAsTags).To(Equal([]byte("Q034Q035")))
+		Expect(SupportedVersionsAsTags).To(Equal([]byte("Q034Q035Q036")))
 	})
 
 	It("has proper version list", func() {
-		Expect(SupportedVersionsAsString).To(Equal("35,34"))
+		Expect(SupportedVersionsAsString).To(Equal("36,35,34"))
 	})
 
 	It("recognizes supported versions", func() {