Merge pull request #1 from cloudflare/master

rebase on master
cloudflare · Apr 1, 2019 · 1bfc946 · 1bfc946
2 parents 7c2aa53 + ea569c5
commit 1bfc946
Show file tree

Hide file tree

Showing 122 changed files with 42,259 additions and 31,032 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ language: go
 
 matrix:
   include:
-    - go: 1.10.x
     - go: 1.11.x
+    - go: 1.12.x
     - go: master
       os: osx
       env: BUILD_TAGS=

diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -52,7 +52,7 @@ required = [
 
 [[constraint]]
   name = "github.com/google/certificate-transparency-go"
-  revision = "5ab67e519c93568ac3ee50fd6772a5bcf8aa460d"
+  version = "v1.0.21"
 
 [[constraint]]
   name = "github.com/jmhodges/clock"

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 
 CFSSL is CloudFlare's PKI/TLS swiss army knife. It is both a command line
 tool and an HTTP API server for signing, verifying, and bundling TLS
-certificates. It requires Go 1.10+ to build.
+certificates. It requires Go 1.11+ to build.
 
 Note that certain linux distributions have certain algorithms removed
 (RHEL-based distributions in particular), so the golang from the
@@ -30,7 +30,7 @@ CFSSL consists of:
 ### Building
 
 Building cfssl requires a
-[working Go 1.10+ installation](http://golang.org/doc/install) and a
+[working Go 1.11+ installation](http://golang.org/doc/install) and a
 properly set `GOPATH`.
 
 ```
@@ -62,7 +62,7 @@ You can set the `GOOS` and `GOARCH` environment variables to have Go cross compi
 ### Installation
 
 Installation requires a
-[working Go 1.10+ installation](http://golang.org/doc/install) and a
+[working Go 1.11+ installation](http://golang.org/doc/install) and a
 properly set `GOPATH`.
 
 ```

diff --git a/vendor/github.com/gogo/protobuf/AUTHORS b/vendor/github.com/gogo/protobuf/AUTHORS
diff --git a/vendor/github.com/gogo/protobuf/CONTRIBUTORS b/vendor/github.com/gogo/protobuf/CONTRIBUTORS
diff --git a/vendor/github.com/gogo/protobuf/GOLANG_CONTRIBUTORS b/vendor/github.com/gogo/protobuf/GOLANG_CONTRIBUTORS
diff --git a/vendor/github.com/gogo/protobuf/LICENSE b/vendor/github.com/gogo/protobuf/LICENSE
diff --git a/vendor/github.com/gogo/protobuf/proto/Makefile b/vendor/github.com/gogo/protobuf/proto/Makefile