[dev.boringcrypto] all: merge master into dev.boringcrypto

Change-Id: I31c69e54c904c66c10920e4c4caacfef08bb834f

diff --cc src/crypto/tls/common.go
Simple merge

diff --cc src/crypto/tls/handshake_client.go
Simple merge

diff --cc src/crypto/tls/handshake_client_tls13.go
Simple merge

diff --cc src/crypto/tls/handshake_server.go
Simple merge

diff --cc src/crypto/tls/handshake_server_tls13.go
Simple merge

diff --cc src/go/build/deps_test.go
index 3a0726a293ea5daa86a1afed1c038330f8fa4236,bf1367355d15044ef0b489fd748aec34748ad4b1..89bae9fd511a0916dc6468c2f3bdbeb0e8cdc065
--- 1/src/go/build/deps_test.go
--- 2/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -388,12 -390,12 +388,12 @@@ var depsRules = 
        < golang.org/x/crypto/curve25519
        < crypto/dsa, crypto/elliptic, crypto/rsa
        < crypto/ecdsa
 -      < CRYPTO-MATH;
 +      < CRYPTO-BORING;
  
 -      CGO, net !< CRYPTO-MATH;
 +      net !< CRYPTO-BORING;
  
        # TLS, Prince of Dependencies.
-       CGO, CRYPTO-BORING, NET, container/list, encoding/hex, encoding/pem
 -      CRYPTO-MATH, NET, container/list, encoding/hex, encoding/pem
++      CRYPTO-BORING, NET, container/list, encoding/hex, encoding/pem
        < golang.org/x/crypto/internal/subtle
        < golang.org/x/crypto/chacha20
        < golang.org/x/crypto/poly1305