]> Cypherpunks repositories - gostls13.git/commit
[dev.boringcrypto] all: merge master into dev.boringcrypto
authorFilippo Valsorda <filippo@golang.org>
Wed, 20 Nov 2019 22:16:28 +0000 (17:16 -0500)
committerFilippo Valsorda <filippo@golang.org>
Wed, 20 Nov 2019 22:54:54 +0000 (17:54 -0500)
commit6657395adf3b709b8a196853d87e756288a5d8c8
tree0ae655be92360b80fca872dd0df495008700958c
parentab0a649d446f7017739151450dfee894d0d8f6a0
parent0ee22d97ad1d1d40df1a58b0efae022e4f82f1b5
[dev.boringcrypto] all: merge master into dev.boringcrypto

Move the import in cipher_suites.go up where it's less likely to ever
conflict again, and remove the equivalent import from common.go, again
to reduce the likeliness of future conflicts.

Change-Id: Ib05daba7ba6ce81f665a44185b53a6e083f7c693
src/crypto/tls/boring.go
src/crypto/tls/cipher_suites.go
src/crypto/tls/common.go