diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2021-05-17 12:18:12 +0200 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2021-05-17 18:03:56 +0000 |
| commit | a2c07a9a1a445c28fa4db9bd1472b28cad3ca818 (patch) | |
| tree | 82bc0b97de5a74116168a5da50217ab6d3babd5e /src/vendor | |
| parent | b9b2bed8933a467dcc48eedeec83dfea7ff3148a (diff) | |
| download | go-a2c07a9a1a445c28fa4db9bd1472b28cad3ca818.tar.gz go-a2c07a9a1a445c28fa4db9bd1472b28cad3ca818.zip | |
all: update golang.org/x/net to latest
To pull in CL 318309.
For #41184
Change-Id: I99adb0478e71dbd72e13551a87ed09eae2a0ef2c
Reviewed-on: https://go-review.googlesource.com/c/go/+/320312
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/vendor')
| -rw-r--r-- | src/vendor/golang.org/x/net/route/empty.s | 1 | ||||
| -rw-r--r-- | src/vendor/modules.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/vendor/golang.org/x/net/route/empty.s b/src/vendor/golang.org/x/net/route/empty.s index bff0231c7d..90ab4ca3d8 100644 --- a/src/vendor/golang.org/x/net/route/empty.s +++ b/src/vendor/golang.org/x/net/route/empty.s @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build darwin && go1.12 // +build darwin,go1.12 // This exists solely so we can linkname in symbols from syscall. diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt index 5b939af60d..1b850342a5 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -8,7 +8,7 @@ golang.org/x/crypto/curve25519 golang.org/x/crypto/hkdf golang.org/x/crypto/internal/subtle golang.org/x/crypto/poly1305 -# golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 +# golang.org/x/net v0.0.0-20210510120150-4163338589ed ## explicit; go 1.17 golang.org/x/net/dns/dnsmessage golang.org/x/net/http/httpguts |