Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into hash
Browse files Browse the repository at this point in the history
* upstream/master: (25 commits)
  Check for HTTP status 200 in fetchAndParse.
  Run everything through gofmt.
  Tweak the imports to make goimports happier.
  Initialize client if passed nil (google#1265)
  Have the caller supply the *http.Client used in logclient.go.
  Review fixes
  Use ASN1 lib to transform TLS encoded list into a Octet String
  Move SCTListLen Check to beginning
  Rework patch
  Add support for serializing SCT Lists
  Get rid of the Java MerkleLeafType enum.
  Add a missing entry to the .gitignore file.
  Get rid of the TLSSerializer class. Make the low-level serialization functions stand-alone ones in a namespace rather than members of a class.
  6962-bis: Implement OID parsing/serialization.
  Do not use std::move in "return" statements.
  Improve stats comments and add additional inc.
  Add additonal stats to outer FixAndLog wrapper.
  [golang] Merkle verifier (google#1161)
  Ignore clang warnings due to unused stuff caused by glog (google#1253)
  Remove a few unnecessary uses of std::move.
  ...
  • Loading branch information
gdbelvin committed Jul 18, 2016
2 parents 53113ef + 4b05f58 commit 85e6668
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

Comodo CA Limited
Ed Maste <emaste@freebsd.org>
Fiaz Hossain <fiaz.hossain@salesforce.com>
Google Inc.
Jeff Trawick <trawick@gmail.com>
Katriel Cohn-Gordon <katriel.cohn-gordon@cybersecurity.ox.ac.uk>
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Deyan Bektchiev <deyan.bektchiev@venafi.com> <deyan@bektchiev.net>
Ed Maste <emaste@freebsd.org>
Emilia Kasper <ekasper@google.com>
Eran Messeri <eranm@google.com> <eran.mes@gmail.com>
Fiaz Hossain <fiaz.hossain@salesforce.com>
Gary Belvin <gbelvin@google.com> <gdbelvin@gmail.com>
Fiaz Hossain <fiaz.hossain@salesforce.com>
Jeff Trawick <trawick@gmail.com>
Expand Down

0 comments on commit 85e6668

Please sign in to comment.