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

Change-Id: I61d6a6d4959fdea8339b9d666385bf6b4ed49d03

diff --cc src/crypto/rsa/pkcs1v15.go
index 5475239c6bfe8a8d613a65f80ecb92fe398cb5c2,0cbd6d004561c96fb9e641e0b92d637c49e43c90..213ddb4addbe4ff6860040e0ccb4d15f265183d9
--- 1/src/crypto/rsa/pkcs1v15.go
--- 2/src/crypto/rsa/pkcs1v15.go
+++ b/src/crypto/rsa/pkcs1v15.go
@@@ -14,11 -14,9 +14,11 @@@ import 
        "crypto/internal/randutil"
  )
  
- // This file implements encryption and decryption using PKCS#1 v1.5 padding.
 +import "crypto/internal/boring"
 +
+ // This file implements encryption and decryption using PKCS #1 v1.5 padding.
  
- // PKCS1v15DecrypterOpts is for passing options to PKCS#1 v1.5 decryption using
+ // PKCS1v15DecrypterOpts is for passing options to PKCS #1 v1.5 decryption using
  // the crypto.Decrypter interface.
  type PKCS1v15DecryptOptions struct {
        // SessionKeyLen is the length of the session key that is being

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

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

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