Updates http2 to x/net/http2 git rev 973f3f3 for:

   http2: make Transport treat http.NoBody like it were nil
   https://golang.org/cl/45993

Updates #18891

Change-Id: I846ccf286992ed2c6249014e51fdeb40b35e50ed
Reviewed-on: https://go-review.googlesource.com/46000
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

Only forget about it if the context timed out, as the comment says.

Fixes #20703.

Change-Id: Ie6234f1a32f85e6bfd052dc24a33aa63b8883c37
Reviewed-on: https://go-review.googlesource.com/45999
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

Per email from acoshift.

Change-Id: Ieb79244d17623e112a385e6b43843d3ffb185cf6
Reviewed-on: https://go-review.googlesource.com/45995Reviewed-by: Matt Layher <mdlayher@gmail.com>

Fixes #20702

Change-Id: Id90f08c33e3ccc37794b47fcd27f6c3f2f41c634
Reviewed-on: https://go-review.googlesource.com/46011Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Make it clearer that -test=X/Y runs all the tests matching X,
even if they don't have sub-tests matching Y.

Fixes #20589.

Change-Id: Ic27e89e748d60f67b50c68445ec0480066bdf207
Reviewed-on: https://go-review.googlesource.com/46030
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

The ascii85, base32 and base64 packages all contain a test called
TestDecoderBuffering.  Each of these tests contain a loop that ignores
the error returned from the Read method of their decoders.  The result
being that the tests loop for ever if the decoders actually return an
error.  This commit fixes the issue by terminating the loops if an error
occurs and failing the tests with a suitable error message.

Change-Id: Idb385673cf9f3f6f8befe4288b4be366ab0985fd
Reviewed-on: https://go-review.googlesource.com/46010Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

If an image has been cropped horizontally, writeImageBlock detects that
its width and Stride differ and acts accordingly.

However, if an image has been cropped vertically, trimming from the
bottom, the whole original image will be written in place.  This results
in more data in the LZW stream than necessary, and many decoders
including image/gif's itself will fail to load.

Fixes #20692

Change-Id: Id332877e31bcf3729c89d8a50c1be0464028d82e
Reviewed-on: https://go-review.googlesource.com/45972
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
Run-TryBot: Nigel Tao <nigeltao@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Nigel Tao <nigeltao@golang.org>

Add Adam Eijdenberg (individual CLA)
Add Agis Anastasopoulos (individual CLA)
Add Alexander Guz (individual CLA)
Add Alexander Kucherenko (individual CLA)
Add Alexander Polcyn (corporate CLA for Google Inc.)
Add Alexis Hildebrandt (individual CLA)
Add Alexis Hunt (corporate CLA for Google Inc.)
Add Andrew Jackura (corporate CLA for Google Inc.)
Add Anthony Voutas (individual CLA)
Add Antoine Martin (individual CLA)
Add Antonio Troina (individual CLA)
Add Bill Prin (corporate CLA for Google Inc.)
Add Brad Jones (corporate CLA for Google Inc.)
Add Chris Raynor (corporate CLA for Google Inc.)
Add Chris Roche (individual CLA)
Add Daker Fernandes Pinheiro (corporate CLA for Intel Corporation)
Add Dave MacFarlane (individual CLA)
Add Derek McGowan (individual CLA)
Add Di Xiao (corporate CLA for Google Inc.)
Add Doug Fawley (corporate CLA for Google Inc.)
Add Eric Chiang (individual CLA)
Add Eyal Posener (individual CLA)
Add Fabian Zaremba (individual CLA)
Add Fredrik Forsmo (individual CLA)
Add Hang Qian (individual CLA)
Add Hsin Tsao (corporate CLA for Google Inc.)
Add James Cowgill (individual CLA)
Add James Hartig (individual CLA)
Add James Myers (individual CLA)
Add Jason Chu (individual CLA)
Add Jay Conrod (corporate CLA for Google Inc.)
Add Jeff (Zhefu) Jiang (corporate CLA for Google Inc.)
Add Jeffrey H (individual CLA)
Add Jianing Yu (corporate CLA for Google Inc.)
Add Josh Deprez (individual CLA)
Add Julian Pastarmov (corporate CLA for Google Inc.)
Add Kai Trukenmüller (individual CLA)
Add Kim Yongbin (individual CLA)
Add Kodie Goodwin (individual CLA)
Add Lev Shamardin (individual CLA)
Add Lucas Bremgartner (individual CLA)
Add Ludi Rehak (individual CLA)
Add Lukasz Milewski (individual CLA)
Add Magnus Hiie (corporate CLA for Teleport Inc.)
Add Marko Mudrinic (individual CLA)
Add Martin Habbecke (corporate CLA for Google Inc.)
Add Martin Hoefling (individual CLA)
Add Martin Probst (individual CLA)
Add Masahiro Furudate (individual CLA)
Add Masahiro Wakame (individual CLA)
Add Masaki Yoshida (individual CLA)
Add Mathias Hall-Andersen (individual CLA)
Add Maxime de Roucy (individual CLA)
Add Nathan Humphreys (individual CLA)
Add Neuman Vong (individual CLA)
Add Pablo Lalloni (individual CLA)
Add Pavlo Sumkin (individual CLA)
Add Peter Morjan (individual CLA)
Add Piers (individual CLA)
Add Qiuxuan Zhu (individual CLA)
Add Richard Dingwall (individual CLA)
Add Rick Sayre (individual CLA)
Add Sascha Brawer (individual CLA)
Add Sergey Mishin (individual CLA)
Add Spencer Tung (corporate CLA for Google Inc.)
Add Steven Erenst (individual CLA)
Add Thomas Bouldin (corporate CLA for Google Inc.)
Add Tobias Klauser (individual CLA)
Add Tonis Tiigi (individual CLA)
Add Trung Nguyen (individual CLA)
Add Vikas Kedia (corporate CLA for Google Inc.)
Add Vladimir Varankin (individual CLA)
Add Yestin Sun (individual CLA)
Add acoshift (individual CLA)

Updates #12042

Change-Id: I5e3ba25f310fc89ae391e5abb308e137d56c9148
Reviewed-on: https://go-review.googlesource.com/45990Reviewed-by: Ian Lance Taylor <iant@golang.org>

In some cases the netpoll code can cause a spurious wakeup. This is
normally harmless, as the woken up code simply retries the operation.
However, for connect, the test we were using to see whether the
connect had succeeded (setsockopt(SO_ERROR)) was not reliable in the
case of a spurious wakeup.  Change to using a reliable test (getpeername).
On Darwin we used a different technique: a second call to connect;
change Darwin to use getpeername as well.

Return the result of getpeername to avoid having to call it twice.

Fixes #19289.

Change-Id: I119ec8e7a41f482f1e590d4c65a37f6103fa22d9
Reviewed-on: https://go-review.googlesource.com/45815
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Verified by manually enabling debug mode and running make.bash.

Fixes #20684.

Change-Id: I041f2ca6ef1d4198815724d98f61511072d63581
Reviewed-on: https://go-review.googlesource.com/45971
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

Minimal reconstruction of reported failure case.

Manually verified that test fails with CL 45911 reverted.

Change-Id: Ia5d11500d91b46ba1eb5d841db3987edb9136c39
Reviewed-on: https://go-review.googlesource.com/45970
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>

Change-Id: I7776547332066e1d7651e9aa06eec301dfaf38bc
Reviewed-on: https://go-review.googlesource.com/45892Reviewed-by: Rob Pike <r@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

Fixes #14270.

Change-Id: Iaf2496a24b1aba443391b90951cef472add73f13
Reviewed-on: https://go-review.googlesource.com/45950
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

The existing docs states that, get looks for a branch or tag
that matches the locally installed version of Go.
First, this is only working for "go1", so it could be confusing.
Second, "If no such version exists it retrieves the most recent
version of the package". It's more the default branch, by git defaults,
rather than most recent version.

This should address the potential unclear parts.

Fixes #20320

Change-Id: Id7d727d88dc350c9902974b64fa28c3766f7e245
Reviewed-on: https://go-review.googlesource.com/45890Reviewed-by: Ian Lance Taylor <iant@golang.org>

Change-Id: I8aa070f8093e80ba19f0546d7447caf847a2b388
Reviewed-on: https://go-review.googlesource.com/45912Reviewed-by: Ian Lance Taylor <iant@golang.org>

This reverts commit edad59cf.

Fixes #20682.

Change-Id: If998c8b4bf177d5da9e26f75579bd5497ec86d38
Reviewed-on: https://go-review.googlesource.com/45911
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>

Change-Id: I64d32fd308f2b7968dfaf11cdc85ab1952170868
Reviewed-on: https://go-review.googlesource.com/45891Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Updates #20587

Change-Id: I428d20bf8512ba859cc63c439bd5d92a5173fad2
Reviewed-on: https://go-review.googlesource.com/45910Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Fixes #20618

Change-Id: I90712bd76d9d47f29221bc298c69737ebee25c12
Reviewed-on: https://go-review.googlesource.com/45814Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Some of the _test.go files in the encoding packages contain a private
function called testEqual that calls testing.Errorf if the arguments
passed to it are unequal.   The line numbers output by such calls to
Errorf identify the failure as being in testEqual itself which is not
very useful.  This commit fixes the problem by adding a call to the
new t.Helper method in each of the testEqual functions.  The line
numbers output when errors do occur now identify the real source of
the error.

Change-Id: I582d1934f40ef2b788116c3811074c67ea882021
Reviewed-on: https://go-review.googlesource.com/45871Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

They were failing when run on 32bit RFS, with 32bit gdb.
(mips64 builder now has 64bit RFS, with gdb 7.9.)
Leaving TestGdbPythonCgo disabled, it behaves as described in #18784.

Fixes #18173

Change-Id: I3c438cd5850b7bfd118ac6396f40c1208bac8c2d
Reviewed-on: https://go-review.googlesource.com/45874Reviewed-by: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

Fixes #20090

Change-Id: I881607e55cd946a703e74a7d8ae2bbde67546510
Reviewed-on: https://go-review.googlesource.com/45816Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

Change-Id: I78443d5874a7667fbac78eac188d402227373da3
Reviewed-on: https://go-review.googlesource.com/45813Reviewed-by: Ian Lance Taylor <iant@golang.org>

Before CL 36170, we identified all function bodies that needed to be
exported before writing any export data.

With CL 36170, we started identifying additional functions while
exporting function bodies. As a consequence, we cannot use a
range-based for loop for iterating over function bodies anymore.

Fixes #18895.

Change-Id: I9cbefa8d311ca8c9898c8272b2ac365976b02396
Reviewed-on: https://go-review.googlesource.com/45817
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>

These are used by DIV[U] and MOD[U] assembly instructions.
Add a test in the stdlib so we actually exercise linking
to these routines.

Update #19507

Change-Id: I0d8e19a53e3744abc0c661ea95486f94ec67585e
Reviewed-on: https://go-review.googlesource.com/45703Reviewed-by: Cherry Zhang <cherryyz@google.com>

Restores functionality added in https://golang.org/cl/35564/ which was
lost in https://golang.org/cl/36798/ by the addition of the custom
fetcher to src/cmd/pprof/pprof.go. The custom fetcher overrides the
upstream default.

Change-Id: Ic71e5e475d043276d916298ab5acb5c9b9ad063e
Reviewed-on: https://go-review.googlesource.com/45812Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

I thought I was almost done, but had forgot the tools section, hidden
in comments.

Move the comments to a <pre> block, so it's visible in the HTML.

Updates #20587

Change-Id: I1dc22c63d9ee297e44bbb742f03b4a722247dbe8
Reviewed-on: https://go-review.googlesource.com/45811Reviewed-by: Ian Lance Taylor <iant@golang.org>

Copy-and-paste bug was putting scripts in the categories map.

Fixes #18186.

Change-Id: Ife9d9bdd346fe24e578dbb2a0aac7ef6e889ae68
Reviewed-on: https://go-review.googlesource.com/45830
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Only one TODO remains, for pprof changes.

Updates #20587

Change-Id: Ib67b23adc7851cc96455b0c20649c8e565a4f92a
Reviewed-on: https://go-review.googlesource.com/45810Reviewed-by: Ian Lance Taylor <iant@golang.org>

Updates #18059
Updates #20587

Change-Id: Icbb4c7cb201ac51d2cc6066620b47ba09ff6fe65
Reviewed-on: https://go-review.googlesource.com/45780Reviewed-by: Chris Broadfoot <cbro@golang.org>

Updates to CL 45698

Updates #19510

Change-Id: Iec7a455b6c4d5f96d0b674459bf1455c99102d62
Reviewed-on: https://go-review.googlesource.com/45779Reviewed-by: Rob Pike <r@golang.org>

The existing code used Type.String() to obtain the name of a type;
specifically type reflect.Method in this case. However, Type.String()
formatting is intended for error messages and uses the format
pkgpath.name instead of pkgname.name if a package (in this case
package reflect) is imported multiple times. As a result, the
reflect.Method type detection failed under peculiar circumstances
(see the included test case).

Thanks to https://github.com/ericlagergren for tracking down
an easy way to make the bug disappear (which in turn directly
led to the underlying cause).

Fixes #19028.

Change-Id: I1b9c5dfd183260a9be74969fe916a94146fc36da
Reviewed-on: https://go-review.googlesource.com/45777Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

The check that the go tool version matched the go compiler version was
too aggressive and didn't cover the bootstrapping case with make.bash.

We never noticed because we never had a VERSION file in place.

Repro:

$ echo "go1.9beta1" > $GOROOT/VERSION
$ cd $GOROOT/src
$ ./make.bash

No test, because x/build/cmd/release catches it.

Updates #19064
Fixes #20674

Change-Id: Ibdd7a92377f4cc77d71ed548f02d48bde6550f67
Reviewed-on: https://go-review.googlesource.com/45778Reviewed-by: Chris Broadfoot <cbro@golang.org>

Update x/net/http2 to git rev 6b17b9baf5 for:

   http2: stop rejecting outgoing paths beginning with two slashes
   https://golang.org/cl/45773

This also uses an updated version of x/tools/cmd/bundle (CL 45190)
that fixes an edge case where it used to drop some comments.

Updates #20627
Fixes #19103

Change-Id: I450d61485e66098f4f8a79954f729f7bcd85856f
Reviewed-on: https://go-review.googlesource.com/45700
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Chris Broadfoot <cbro@golang.org>

Change-Id: I27aa87607aa82b400411a60c6bdb6f9a42ff97c1
Reviewed-on: https://go-review.googlesource.com/45776
Run-TryBot: Chris Broadfoot <cbro@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Change-Id: I824fc5a62977140ccc62d55e8b42cfd01da935e9
Reviewed-on: https://go-review.googlesource.com/45774Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

Add Adam Bender (corporate CLA for Google Inc.)
Add Ahmet Alp Balkan (corporate CLA for Google Inc.)
Add Aishraj Dahal (individual CLA)
Add Alexey Neganov (individual CLA)
Add Andrew Benton (individual CLA)
Add Bartosz Grzybowski (individual CLA)
Add Ben Shi (individual CLA)
Add Brandon Bennett (corporate CLA for Facebook, Inc.)
Add Brian Starke (individual CLA)
Add Bulat Gaifullin (individual CLA)
Add Carl Henrik Lunde (individual CLA)
Add Carlisia Campos (individual CLA)
Add Carlo Alberto Ferraris (individual CLA)
Add Carolyn Van Slyck (individual CLA)
Add Chew Choon Keat (individual CLA)
Add Chris Biscardi (individual CLA)
Add Damien Lespiau (corporate CLA for Intel Corporation)
Add David NewHamlet (individual CLA)
Add Dieter Plaetinck (corporate CLA for RainTank)
Add Dominic Green (individual CLA)
Add Eitan Adler (individual CLA)
Add Evgeniy Polyakov (individual CLA)
Add Ewan Valentine (individual CLA)
Add Fangming Fang (corporate CLA for ARM Ltd.)
Add Felipe Oliveira (individual CLA)
Add Filip Gruszczyński (individual CLA)
Add Gengliang Wang (individual CLA)
Add George Gkirtsou (individual CLA)
Add Gregory Man (individual CLA)
Add Hauke Löffler (individual CLA)
Add Heschi Kreinick (corporate CLA for Google Inc.)
Add Hongfei Tan (individual CLA)
Add Hugues Bruant (individual CLA)
Add Ibrahim AshShohail (individual CLA)
Add James Neve (individual CLA)
Add James Smith (individual CLA)
Add Jamie Stackhouse (individual CLA)
Add Jan Berktold (individual CLA)
Add Jeff Johnson (corporate CLA for Google Inc.)
Add Joe Richey (corporate CLA for Google Inc.)
Add Johan Brandhorst (individual CLA)
Add Jonathan Stacks (individual CLA)
Add Jordan Krage (individual CLA)
Add Josselin Costanzi (individual CLA)
Add Joël Stemmer (corporate CLA for Google Inc.)
Add Julio Montes (corporate CLA for Intel Corporation)
Add Kamil Chmielewski (individual CLA)
Add Karoly Negyesi (individual CLA)
Add Keiji Yoshida (individual CLA)
Add Kirill Smelkov (corporate CLA for Nexedi)
Add Koichi Shiraishi (individual CLA)
Add Kris Nova (individual CLA)
Add Kyrylo Silin (individual CLA)
Add Lars Jeppesen (individual CLA)
Add Lars Wiegman (individual CLA)
Add Laurie Clark-Michalek (individual CLA)
Add Lion Yang (individual CLA)
Add Lorenzo Masini (individual CLA)
Add Lucas Clemente (corporate CLA for Google Inc.)
Add Marcelo E. Magallon (individual CLA)
Add Mark Adams (individual CLA)
Add Mark Harrison (corporate CLA for Google Inc.)
Add Mark Ryan (corporate CLA for Intel Corporation)
Add Martin Lindhe (individual CLA)
Add Marwan Sulaiman (individual CLA)
Add Matt Blair (individual CLA)
Add Matt Harden (individual CLA)
Add Matt Strong (individual CLA)
Add Mike Wiacek (corporate CLA for Google Inc.)
Add Milutin Jovanović (individual CLA)
Add Monis Khan (corporate CLA for Red Hat, Inc.)
Add Mostyn Bramley-Moore (individual CLA)
Add Mura Li (individual CLA)
Add Máté Gulyás (individual CLA)
Add Nathan Caza (individual CLA)
Add Nicholas Maniscalco (individual CLA)
Add Nick Kubala (corporate CLA for Google Inc.)
Add Nick Miyake (individual CLA)
Add Niklas Schnelle (individual CLA)
Add Patrick Pelletier (individual CLA)
Add Paul Jolly (individual CLA)
Add Paulo Flabiano Smorigo (corporate CLA for IBM)
Add Peter Nguyen (individual CLA)
Add Pravendra Singh (individual CLA)
Add Raymond Kazlauskas (individual CLA)
Add Remi Gillig (individual CLA)
Add Sam Boyer (individual CLA)
Add Sean Chittenden (corporate CLA for Joyent, Inc.)
Add Sean Christopherson (corporate CLA for Intel Corporation)
Add Shintaro Kaneko (individual CLA)
Add Takuto Ikuta (corporate CLA for Google Inc.)
Add Thomas Bonfort (individual CLA)
Add Toshiki Shima (individual CLA)
Add Trey Roessig (individual CLA)
Add Wade Simmons (individual CLA)
Add Wei Xiao (corporate CLA for ARM Ltd.)
Add Weichao Tang (individual CLA)
Add Will Storey (individual CLA)
Add Wu Yunzhou (individual CLA)
Add Xu Fee (individual CLA)
Add Zach Bintliff (individual CLA)
Add Zak (individual CLA)
Add Zellyn Hunter (corporate CLA for Square, Inc.)
Add Максим Федосеев (individual CLA)
Add 张嵩 (individual CLA)

Updates #12042

Change-Id: I43922a9489828e519e480f8fc1abc92863e0abcc
Reviewed-on: https://go-review.googlesource.com/45770Reviewed-by: Ian Lance Taylor <iant@golang.org>

Fixes #19695

Change-Id: Ie5103f7905969e25dba6e5fb37344b70e807fc69
Reviewed-on: https://go-review.googlesource.com/45702
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

Fixes #17615

Change-Id: I7f88c0c6579c79007492e765d1b5ca4f28d19575
Reviewed-on: https://go-review.googlesource.com/45771Reviewed-by: Russ Cox <rsc@golang.org>

Marshal must process unexported embedded fields of struct type,
looking for exported fields in those structs. However, it must
not process unexported embedded fields of non-struct type.

For example, consider:

    type t1 struct {
        X int
    }
    type t2 int
    type T struct {
        t1
        t2
    }

When considering T, Marshal must process t1 to find t1.X.
Marshal must not process t2, but it was. Fix that.

Fixes #18009

Change-Id: I62ba0b65ba30fd927990e101a26405a9998787a3
Reviewed-on: https://go-review.googlesource.com/33773
Run-TryBot: Russ Cox <rsc@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>