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

Change-Id: Ic5f71c04f08c03319c043f35be501875adb0a3b0

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

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

diff --cc src/crypto/ecdsa/ecdsa.go
Simple merge

diff --cc src/crypto/tls/common.go
index fdcebd8a06e17d0475f3632570b2819d57d153af,59b41effbe166e31300f03a4052a51974ddce0b8..1861efce66c96df3b93b8ce29104fa212b7e949b
--- 1/src/crypto/tls/common.go
--- 2/src/crypto/tls/common.go
+++ b/src/crypto/tls/common.go
@@@ -988,10 -981,7 +984,10 @@@ const roleServer = fals
  func (c *Config) supportedVersions(isClient bool) []uint16 {
        versions := make([]uint16, 0, len(supportedVersions))
        for _, v := range supportedVersions {
-               if (c == nil || c.MinVersion == 0) && !debugEnableTLS10 &&
 +              if needFIPS() && (v < fipsMinVersion(c) || v > fipsMaxVersion(c)) {
 +                      continue
 +              }
+               if (c == nil || c.MinVersion == 0) &&
                        isClient && v < VersionTLS12 {
                        continue
                }

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

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

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