mirror of
https://github.com/golang/go
synced 2024-09-30 00:14:36 -06:00
185e6094fd
This is a git merge of master into dev.boringcrypto. The branch was previously based on release-branch.go1.9, so there are a handful of spurious conflicts that would also arise if trying to merge master into release-branch.go1.9 (which we never do). Those have all been resolved by taking the original file from master, discarding any Go 1.9-specific edits. all.bash passes on darwin/amd64, which is to say without actually using BoringCrypto. Go 1.10-related fixes to BoringCrypto itself will be in a followup CL. This CL is just the merge. Change-Id: I4c97711fec0fb86761913dcde28d25c001246c35 |
||
---|---|---|
.. | ||
android | ||
arm | ||
boring | ||
cgo | ||
chrome/gophertool | ||
git | ||
ios | ||
linkcheck | ||
nacl | ||
sortac | ||
swig | ||
trace | ||
benchcmp | ||
editors |