merge upstream

Former-commit-id: b1699eddfbe71837d0703c6c998624bdcffeee55 [formerly 324fd14865ea1bddc19d776718d1d8e1cf3ee210]
Former-commit-id: 2523cca14cf81b44d7fe05a121524e38f9ecc77d
This commit is contained in:
Preston Van Loon
2018-02-18 21:03:41 -05:00
109 changed files with 1772 additions and 848 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2015 The go-ethereum Authors
// Copyright 2017 The go-ethereum Authors
// This file is part of the go-ethereum library.
//
// The go-ethereum library is free software: you can redistribute it and/or modify