Patch go net

See https://code.google.com/p/go/issues/detail?id=6670

Upstram CL: https://codereview.appspot.com/83690045

Fixes #2938

ping @tianon