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

Change-Id: Ia661c871e14445672b7d36a443455302e47cc2a1

diff --cc src/cmd/compile/internal/gc/reflect.go
Simple merge

diff --cc src/cmd/go/internal/load/pkg.go
Simple merge

diff --cc src/cmd/link/internal/ld/lib.go
Simple merge

diff --cc src/crypto/rand/rand_unix.go
Simple merge

diff --cc src/crypto/tls/cipher_suites.go
index e4027e8ab4374b62fd50e31bbc4c28f02d6dd213,e937235876e7ece3a6e9df6c89b0454793d59d83..2475906ae17b133983ff8a58abb9a18b041f2c52
--- 1/src/crypto/tls/cipher_suites.go
--- 2/src/crypto/tls/cipher_suites.go
+++ b/src/crypto/tls/cipher_suites.go
@@@ -136,11 -134,7 +135,11 @@@ func macSHA1(version uint16, key []byte
                copy(mac.key, key)
                return mac
        }
 -      return tls10MAC{h: hmac.New(newConstantTimeHash(sha1.New), key)}
 +      h := sha1.New
 +      if !boring.Enabled {
 +              h = newConstantTimeHash(h)
 +      }
-       return tls10MAC{hmac.New(h, key)}
++      return tls10MAC{h: hmac.New(h, key)}
  }
  
  // macSHA256 returns a SHA-256 based MAC. These are only supported in TLS 1.2

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_messages_test.go
Simple merge

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

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

diff --cc src/crypto/x509/verify.go
Simple merge

diff --cc src/go/build/deps_test.go
Simple merge