Fixes #3867. Fixes #3307. R=bradfitz, dvyukov CC=golang-dev https://golang.org/cl/7735044
Attach a file by drag & drop or click to upload
