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

Change-Id: I04d511ed8e3e7ca4a3267f226a0c3e248c0f84a9

diff --cc src/cmd/compile/internal/amd64/versions_test.go
Simple merge

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

diff --cc src/cmd/go/go_test.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/go/build/build.go
index 4bf46a8970be3a882096aa93e0c5a9a9138730a5,df505312ce32a66f353977858eb93e096f0709e4..4ec9ed57a2b1bea1c01d198289ce6e03f3ec9e89
--- 1/src/go/build/build.go
--- 2/src/go/build/build.go
+++ b/src/go/build/build.go
@@@ -1900,10 -1913,9 +1914,13 @@@ func (ctxt *Context) matchTag(name stri
        if ctxt.GOOS == "ios" && name == "darwin" {
                return true
        }
+       if name == "unix" && unixOS[ctxt.GOOS] {
+               return true
+       }
 +      // Let applications know that the Go+BoringCrypto toolchain is in use.
 +      if name == "boringcrypto" {
 +              return true
 +      }
  
        // other tags
        for _, tag := range ctxt.BuildTags {

diff --cc src/go/build/deps_test.go
index 785e14cab9aae2274f69e68d80dd4fb3399b829a,5794e3d25e9db50b3230996f61145348b2a1fc94..ade6519b8d76f0be2ca9ba6056c3a4e28ae2b4b7
--- 1/src/go/build/deps_test.go
--- 2/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -444,14 -442,13 +440,19 @@@ var depsRules = 
        < crypto/x509
        < crypto/tls;
  
 +      crypto/internal/boring/sig, crypto/internal/boring/fipstls
 +      < crypto/tls/fipsonly;
 +
 +      crypto/internal/boring
 +      < crypto/boring;
 +
        # crypto-aware packages
  
 -      CRYPTO, DEBUG, go/build, go/types, text/scanner
++      CRYPTO-BORING, DEBUG, go/build, go/types, text/scanner
+       < internal/pkgbits
+       < go/internal/gcimporter, go/internal/gccgoimporter, go/internal/srcimporter
+       < go/importer;
+ 
        NET, crypto/rand, mime/quotedprintable
        < mime/multipart;
  

diff --cc src/runtime/race/testdata/mop_test.go
Simple merge