From: Austin Clements <austin@google.com>
Date: Tue, 5 Apr 2016 20:37:29 +0000 (-0400)
Subject: [dev.garbage] Merge branch 'master' into dev.garbage
X-Git-Tag: go1.7beta1~405^2~23
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6d6e16001bb04d4bf60c6d14d1f64684a043ef6c;p=gostls13.git

[dev.garbage] Merge branch 'master' into dev.garbage

Change-Id: I47ac4112befc07d3674d7a88827227199edd93b4
---

6d6e16001bb04d4bf60c6d14d1f64684a043ef6c