Update references from code.google.com to GitHub.

The offical subrepos are now pointed to by golang.org/x/name (see [1]).
This change updates the code.google.com pointers to use those redirects.

Also, the home of the protobuf library has moved to GitHub, and so
that's changed too. No more references to code.google.com remain.

[1] https://groups.google.com/forum/#!msg/golang-nuts/eD8dh3T9yyA/l5Ail-xfMiAJ

bbssig/bbssig.go

@@ -28,7 +28,7 @@ import (
 	"io"
 	"math/big"
 
-	"code.google.com/p/go.crypto/bn256"
+	"golang.org/x/crypto/bn256"
 )
 
 // SignatureSize is the size, in bytes, of the signatures produced by this

bn256cgo/bn256_test.go

@@ -2,9 +2,10 @@ package bn256cgo
 
 import (
 	"bytes"
-	"code.google.com/p/go.crypto/bn256"
 	"math/big"
 	"testing"
+
+	"golang.org/x/crypto/bn256"
 )
 
 func TestPowers(t *testing.T) {

client/background.go

@@ -10,9 +10,9 @@ import (
 	"path/filepath"
 	"time"
 
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/goprotobuf/proto"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 var backgroundCanceledError = errors.New("background task canceled")

client/cli-input.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"code.google.com/p/go.crypto/ssh/terminal"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 type cliCommand struct {

client/cli.go

@@ -15,12 +15,12 @@ import (
 	"syscall"
 	"time"
 
-	"code.google.com/p/go.crypto/ssh/terminal"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/client/disk"
 	"github.com/agl/pond/client/system"
 	"github.com/agl/pond/panda"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 const haveCLI = true

client/client.go

@@ -76,16 +76,16 @@ import (
 	"sync"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/ed25519"
 	"github.com/agl/ed25519/extra25519"
 	"github.com/agl/pond/bbssig"
 	"github.com/agl/pond/client/disk"
 	"github.com/agl/pond/client/ratchet"
 	"github.com/agl/pond/panda"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 const (

client/client_test.go

@@ -18,9 +18,9 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
 	panda "github.com/agl/pond/panda"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
 )
 
 // clientLogToStderr controls whether the TestClients will log to stderr during

client/disk.go

@@ -4,11 +4,11 @@ import (
 	"errors"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/bbssig"
 	"github.com/agl/pond/client/disk"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
 )
 
 // erasureRotationTime is the amount of time that we'll use a single erasure

client/disk/disk.go

@@ -10,9 +10,9 @@ import (
 	"sync"
 	"syscall"
 
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/go.crypto/scrypt"
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/nacl/secretbox"
+	"golang.org/x/crypto/scrypt"
 )
 
 const (

client/disk/tpm_linux.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"io"
 
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/client/tpm"
+	"github.com/golang/protobuf/proto"
 )
 
 func init() {
@@ -221,5 +221,5 @@ func (t *TPM) Destroy(key *[kdfKeyLen]byte) error {
 	}
 
 	nvram.Index = t.index
-	return nvram.Destroy();
+	return nvram.Destroy()
 }

client/gui.go

@@ -15,10 +15,10 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/client/disk"
 	"github.com/agl/pond/panda"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
 )
 
 const haveGUI = true

client/main_linux.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"code.google.com/p/go.crypto/scrypt"
+	"golang.org/x/crypto/scrypt"
 )
 
 func main() {

client/network.go

@@ -18,14 +18,14 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/nacl/box"
-	"code.google.com/p/go.net/proxy"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/ed25519"
 	"github.com/agl/pond/bbssig"
 	pond "github.com/agl/pond/protos"
 	"github.com/agl/pond/transport"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/nacl/box"
+	"golang.org/x/net/proxy"
 )
 
 const (

client/ratchet/ratchet.go

@@ -12,11 +12,11 @@ import (
 	"io"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/client/disk"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 const (

client/ratchet/ratchet_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
 	pond "github.com/agl/pond/protos"
+	"golang.org/x/crypto/curve25519"
 )
 
 func nowFunc() time.Time {

decrypt/decrypt.go

@@ -11,9 +11,9 @@ import (
 	"io/ioutil"
 	"os"
 
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/goprotobuf/proto"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 func main() {

doc/index.html

@@ -99,7 +99,7 @@ <h5>Fedora 19</h5>
 <pre>sudo yum install gtk3-devel gtkspell3-devel gcc trousers-devel git mercurial tor
 sudo systemctl start tor
 cd
-hg clone https://code.google.com/p/go
+git clone https://github.com/golang/go
 cd go/src
 ./all.bash
 cd

editstate/editstate.go

@@ -18,11 +18,11 @@ import (
 	"strings"
 	"syscall"
 
-	"code.google.com/p/go.crypto/ssh/terminal"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/client/disk"
 	"github.com/agl/pond/client/system"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 var (

editstate/editstate_test.go

@@ -5,8 +5,8 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/client/disk"
+	"github.com/golang/protobuf/proto"
 )
 
 func TestSerializedDeserialize(t *testing.T) {

panda/appengine.go

@@ -3,7 +3,6 @@ package panda
 import (
 	"bufio"
 	"bytes"
-	"code.google.com/p/go.net/proxy"
 	"crypto/tls"
 	"encoding/hex"
 	"errors"
@@ -14,6 +13,8 @@ import (
 	"net/url"
 	"strings"
 	"time"
+
+	"golang.org/x/net/proxy"
 )
 
 type HTTPMeetingPlace struct {

panda/panda.go

@@ -14,12 +14,12 @@ import (
 	"strings"
 	"sync"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/hkdf"
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/go.crypto/scrypt"
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/pond/panda/rijndael"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/hkdf"
+	"golang.org/x/crypto/nacl/secretbox"
+	"golang.org/x/crypto/scrypt"
 
 	panda_proto "github.com/agl/pond/panda/proto"
 )

protos/const.go

@@ -1,6 +1,6 @@
 package protos
 
-import "code.google.com/p/go.crypto/nacl/secretbox"
+import "golang.org/x/crypto/nacl/secretbox"
 
 // TransportSize is the number of bytes that all payloads are padded to before
 // sending on the network.

server/main.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/goprotobuf/proto"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
 
 	pond "github.com/agl/pond/protos"
 	"github.com/agl/pond/server/protos"

server/server.go

@@ -17,11 +17,11 @@ import (
 	"sync"
 	"time"
 
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/ed25519"
 	"github.com/agl/pond/bbssig"
 	pond "github.com/agl/pond/protos"
 	"github.com/agl/pond/transport"
+	"github.com/golang/protobuf/proto"
 )
 
 const (

server/server_test.go

@@ -17,14 +17,14 @@ import (
 	"testing"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/salsa20"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/salsa20"
 
-	"code.google.com/p/goprotobuf/proto"
 	"github.com/agl/ed25519"
 	"github.com/agl/pond/bbssig"
 	pond "github.com/agl/pond/protos"
 	"github.com/agl/pond/transport"
+	"github.com/golang/protobuf/proto"
 )
 
 type TestServer struct {

transport/transport.go

@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"time"
 
-	"code.google.com/p/go.crypto/curve25519"
-	"code.google.com/p/go.crypto/nacl/secretbox"
-	"code.google.com/p/goprotobuf/proto"
 	pond "github.com/agl/pond/protos"
+	"github.com/golang/protobuf/proto"
+	"golang.org/x/crypto/curve25519"
+	"golang.org/x/crypto/nacl/secretbox"
 )
 
 // blockSize is the size of the blocks of data that we'll send and receive when

transport/transport_test.go

@@ -9,8 +9,8 @@ import (
 	"net"
 	"testing"
 
-	"code.google.com/p/go.crypto/curve25519"
 	pond "github.com/agl/pond/protos"
+	"golang.org/x/crypto/curve25519"
 )
 
 func NewBiDiPipe() (x, y net.Conn) {