]> Cypherpunks repositories - gostls13.git/commitdiff
[dev.boringcrypto] all: merge master into dev.boringcrypto
authorFilippo Valsorda <filippo@golang.org>
Thu, 6 Sep 2018 17:25:27 +0000 (13:25 -0400)
committerFilippo Valsorda <filippo@golang.org>
Thu, 6 Sep 2018 17:25:27 +0000 (13:25 -0400)
Change-Id: Ia8ddd4e52dcfe87f9daef2edd37c8155fcae7f5a

1  2 
src/cmd/compile/internal/gc/reflect.go
src/cmd/go/go_test.go
src/cmd/go/internal/load/pkg.go
src/cmd/link/internal/ld/lib.go
src/crypto/aes/cipher_asm.go
src/crypto/rand/rand_unix.go
src/crypto/tls/common.go
src/crypto/tls/handshake_client.go
src/crypto/tls/handshake_server.go
src/crypto/x509/verify.go
src/go/build/deps_test.go

Simple merge
Simple merge
Simple merge
Simple merge
index f7cd74693de8183ec0b83c36aeda7ee140d44160,cebb7a761cd0de1b0c4dc546dd6128a3e6c9f58f..13c874a96135bc33a3ecfc8eda5f8bae657da0f1
@@@ -13,7 -13,7 +13,8 @@@ import 
        "bufio"
        "crypto/aes"
        "crypto/cipher"
 +      "crypto/internal/boring"
+       "encoding/binary"
        "io"
        "os"
        "runtime"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge