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

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

Change-Id: I177856ea2bc9943cbde28ca9afa145b6ea5b0942
---

ae68090d000c0a4a6cda0ef44a59809f914e2358