From: Russ Cox <rsc@golang.org>
Date: Tue, 2 Feb 2016 14:23:40 +0000 (-0500)
Subject: all: merge master into release-branch.go1.6
X-Git-Tag: go1.6rc2~3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9a80b5e1f3b4728e161c0972d8e692c3bc915bb5;p=gostls13.git

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

Change-Id: I10a3abc28028e35c5d92d1bd33ac64fe0825eae7
---

9a80b5e1f3b4728e161c0972d8e692c3bc915bb5