all: restore changes from faulty merge/revert

This reverts commit 3b6abd8a4501d816e80b4d46e6fda4df486ccb66.

Change-Id: I8ca100501c1844af78a547989786d14dac6b494a
Reviewed-on: https://go-review.googlesource.com/93456
Reviewed-by: Andrew Bonventre <andybons@golang.org>

7 files changed, 20 insertions, 19 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE
deleted file mode 100644
index 00014e9b86..0000000000
--- a/.github/PULL_REQUEST_TEMPLATE
+++ /dev/null
@@ -1,7 +0,0 @@
-Please do not send pull requests to the golang/* repositories.
-
-We do, however, take contributions gladly.
-
-See https://golang.org/doc/contribute.html
-
-Thanks!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4f2c4d4b02..7c1dd54b30 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -30,11 +30,6 @@ For change proposals, see [Proposing Changes To Go](https://github.com/golang/pr
 
 Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html) before sending patches.
 
-**We do not accept GitHub pull requests**
-(we use [an instance](https://go-review.googlesource.com/) of the
-[Gerrit](https://www.gerritcodereview.com/) code review system instead).
-Also, please do not post patches on the issue tracker.
-
 Unless otherwise noted, the Go source files are distributed under
 the BSD-style license found in the LICENSE file.
 
diff --git a/README.md b/README.md
index 57492b3fb0..bb3d895d45 100644
--- a/README.md
+++ b/README.md
@@ -36,10 +36,9 @@ Go is the work of hundreds of contributors. We appreciate your help!
 To contribute, please read the contribution guidelines:
 	https://golang.org/doc/contribute.html
 
-Note that the Go project does not use GitHub pull requests, and that
-we use the issue tracker for bug reports and proposals only. See
-https://golang.org/wiki/Questions for a list of places to ask
-questions about the Go language.
+Note that the Go project uses the issue tracker for bug reports and
+proposals only. See https://golang.org/wiki/Questions for a list of
+places to ask questions about the Go language.
 
 [rf]: https://reneefrench.blogspot.com/
 [cc3-by]: https://creativecommons.org/licenses/by/3.0/
diff --git a/doc/devel/release.html b/doc/devel/release.html
index 24fe583062..d82fb0c630 100644
--- a/doc/devel/release.html
+++ b/doc/devel/release.html
@@ -57,6 +57,12 @@ See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.3">Go
 1.9.3 milestone</a> on our issue tracker for details.
 </p>
 
+<p>
+go1.9.4 (released 2018/02/07) includes a security fix to “go get”.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.9.4">Go
+1.9.4</a> milestone on our issue tracker for details.
+</p>
+
 <h2 id="go1.8">go1.8 (released 2017/02/16)</h2>
 
 <p>
@@ -114,6 +120,13 @@ See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.6">Go
 1.8.6 milestone</a> on our issue tracker for details.
 </p>
 
+<p>
+go1.8.7 (released 2018/02/07) includes a security fix to “go get”.
+It contains the same fix as Go 1.9.4 and was released at the same time.
+See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.8.7">Go
+1.8.7</a> milestone on our issue tracker for details.
+</p>
+
 <h2 id="go1.7">go1.7 (released 2016/08/15)</h2>
 
 <p>
diff --git a/doc/diagnostics.html b/doc/diagnostics.html
index 0ed0e81b92..35aae156e8 100644
--- a/doc/diagnostics.html
+++ b/doc/diagnostics.html
@@ -222,7 +222,7 @@ an execution tracer to trace the runtime events within an interval.
 <p>Tracing enables us to:</p>
 
 <ul>
-<li>Instrument and profile application latency in a Go process.</li>
+<li>Instrument and analyze application latency in a Go process.</li>
 <li>Measure the cost of specific calls in a long chain of calls.</li>
 <li>Figure out the utilization and performance improvements.
 Bottlenecks are not always obvious without tracing data.</li>
diff --git a/doc/go1.10.html b/doc/go1.10.html
index 5885176f46..569e420d51 100644
--- a/doc/go1.10.html
+++ b/doc/go1.10.html
@@ -785,7 +785,8 @@ Parsed certificates also now report URI names and IP, email, and URI constraints
 <a href="/pkg/crypto/x509/#Certificate"><code>Certificate</code></a> fields
 <code>URIs</code>, <code>PermittedIPRanges</code>, <code>ExcludedIPRanges</code>,
 <code>PermittedEmailAddresses</code>, <code>ExcludedEmailAddresses</code>,
-<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>.
+<code>PermittedURIDomains</code>, and <code>ExcludedURIDomains</code>. Certificates with
+invalid values for those fields are now rejected.
 </p>
 
 <p>
diff --git a/src/cmd/fix/cftype.go b/src/cmd/fix/cftype.go
index df1cc18f9e..b47b06682a 100644
--- a/src/cmd/fix/cftype.go
+++ b/src/cmd/fix/cftype.go
@@ -119,7 +119,7 @@ func typefix(f *ast.File, badType func(string) bool) bool {
 		if !ok {
 			return
 		}
-		t := s.X.(*ast.SelectorExpr)
+		t, ok := s.X.(*ast.SelectorExpr)
 		if !ok {
 			return
 		}