From: Filippo Valsorda <filippo@golang.org>
Date: Thu, 6 Sep 2018 17:25:27 +0000 (-0400)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~138
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4d1aa482b8;p=gostls13.git

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

Change-Id: Ia8ddd4e52dcfe87f9daef2edd37c8155fcae7f5a
---

4d1aa482b8754c081d8f3f6b39fe61dd2e6504fc
diff --cc src/crypto/rand/rand_unix.go
index f7cd74693d,cebb7a761c..13c874a961
--- a/src/crypto/rand/rand_unix.go
+++ b/src/crypto/rand/rand_unix.go
@@@ -13,7 -13,7 +13,8 @@@ import 
  	"bufio"
  	"crypto/aes"
  	"crypto/cipher"
 +	"crypto/internal/boring"
+ 	"encoding/binary"
  	"io"
  	"os"
  	"runtime"