From revision d0880223588919729793727c9d65f202a73cda77. R=golang-dev, bradfitz CC=golang-dev https://golang.org/cl/35850048