From 648bb34484e177067b1fc4aa159cd08f9ad2bbf7 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <hi@filippo.io>
Date: Wed, 1 Feb 2017 19:57:11 +0000
Subject: [PATCH] [release-branch.go1.8] doc: mention SHA-256 CBC suites are
 off by default

Change-Id: I82c41bd1d82adda457ddb5dd08caf0647905da22
Reviewed-on: https://go-review.googlesource.com/36091
Reviewed-by: Matt Layher <mdlayher@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
(cherry picked from commit de479267ef9db0911dac68e94d75186313bae11d)
Reviewed-on: https://go-review.googlesource.com/36130
---
 doc/go1.8.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/go1.8.html b/doc/go1.8.html
index af56ae6b3a..9e3145e8b8 100644
--- a/doc/go1.8.html
+++ b/doc/go1.8.html
@@ -799,9 +799,9 @@ Optimizations and minor bug fixes are not listed.
       hardware support for AES-GCM is present.
     </p>
 
-    <p> <!-- CL 27315 -->
+    <p> <!-- CL 27315, CL 35290 -->
       AES-128-CBC cipher suites with SHA-256 are also
-      now supported.
+      now supported, but disabled by default.
     </p>
 
   </dd>
-- 
2.52.0