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

Change-Id: I218ba1b89a2df6e4335c6a5846889d9a04affe5d

diff --cc src/cmd/go/go_test.go
Simple merge

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

diff --cc src/crypto/rand/rand_unix.go
index 13c874a96135bc33a3ecfc8eda5f8bae657da0f1,d49f693746dcc8af240ad1439cccd3e8ac50d3f7..272b83d52be21ed3c58f2dd2a203881a0cd04a9f
--- 1/src/crypto/rand/rand_unix.go
--- 2/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@@ -51,7 -48,12 +53,13 @@@ type devReader struct 
  var altGetRandom func([]byte) (ok bool)
  
  func (r *devReader) Read(b []byte) (n int, err error) {
 +      boring.Unreachable()
+       if atomic.CompareAndSwapInt32(&r.used, 0, 1) {
+               // First use of randomness. Start timer to warn about
+               // being blocked on entropy not being available.
+               t := time.AfterFunc(60*time.Second, warnBlocked)
+               defer t.Stop()
+       }
        if altGetRandom != nil && r.name == urandomDevice && altGetRandom(b) {
                return len(b), nil
        }

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

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

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