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

Change-Id: I52009bf809dda4fbcff03aa82d0ea8aa2a978fa2

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/crypto/rand/rand_unix.go
index c9eb7d992de0aea9da3213612bb441da1cfcc47f,2dd4158888ffa849d154555d223a525dd33e0205..0b137e131f0142b50b6082cc4b39168080bab3db
--- 1/src/crypto/rand/rand_unix.go
--- 2/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@@ -48,8 -88,10 +94,11 @@@ func warnBlocked() 
  }
  
  func (r *reader) Read(b []byte) (n int, err error) {
-       if atomic.CompareAndSwapInt32(&r.used, 0, 1) {
 +      boring.Unreachable()
+       r.mu.Lock()
+       defer r.mu.Unlock()
+       if !r.used {
+               r.used = true
                // First use of randomness. Start timer to warn about
                // being blocked on entropy not being available.
                t := time.AfterFunc(time.Minute, warnBlocked)

diff --cc src/crypto/rsa/pkcs1v15.go
Simple merge

diff --cc src/crypto/rsa/pkcs1v15_test.go
Simple merge

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

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

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

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