From: Chris Broadfoot <cbro@golang.org>
Date: Tue, 2 Aug 2016 01:26:06 +0000 (-0700)
Subject: all: merge master into release-branch.go1.7
X-Git-Tag: go1.7rc4~1
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8ea89ba858823212114de952b8a1375ceb82587f;p=gostls13.git

all: merge master into release-branch.go1.7

Change-Id: Ifb9647fa9817ed57aa4835a35a05020aba00a24e
---

8ea89ba858823212114de952b8a1375ceb82587f