Change the canonical upstream repo location to gitlab

This commit changes the upstream repo location to:
  https://gitlab.com/yawning/obfs4.git

Additionally all the non-`main` sub-packages now have an import
comment annotation.  As a matter of courtesy, I will continue to
push to both the existing github.com and git.torproject.org repos
for the foreseeable future, though I reserve the right to stop
doing so at any time.

ChangeLog

@@ -3,6 +3,7 @@ Changes in version 0.0.8 - UNRELEASED:
  - (meek_lite) Explicitly set Content-Length to zero when there is no data
    to send.
  - Added optional support for building as a Go 1.11 module.  Patch by mvdan.
+ - Change the canonical upstream repo location to gitlab.
 
 Changes in version 0.0.7 - 2016-11-15:
  - Support configuring the obfs4 IAT parameter as the sole

common/csrand/csrand.go

@@ -31,7 +31,7 @@
 // Not all of the convinience routines are replicated, only those that are
 // immediately useful.  The Rand variable provides access to the full math/rand
 // API.
-package csrand
+package csrand // import "gitlab.com/yawning/obfs4.git/common/csrand"
 
 import (
 	cryptRand "crypto/rand"

common/drbg/hash_drbg.go

@@ -27,7 +27,7 @@
 
 // Package drbg implements a minimalistic DRBG based off SipHash-2-4 in OFB
 // mode.
-package drbg
+package drbg // import "gitlab.com/yawning/obfs4.git/common/drbg"
 
 import (
 	"encoding/binary"
@@ -36,8 +36,7 @@ import (
 	"hash"
 
 	"github.com/dchest/siphash"
-
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
 )
 
 // Size is the length of the HashDrbg output.

common/log/log.go

@@ -27,7 +27,7 @@
 
 // Package log implements a simple set of leveled logging wrappers around the
 // standard log package.
-package log
+package log // import "gitlab.com/yawning/obfs4.git/common/log"
 
 import (
 	"fmt"

common/ntor/ntor.go

@@ -32,7 +32,7 @@
 //
 // Before using this package, it is strongly recommended that the specification
 // is read and understood.
-package ntor
+package ntor // import "gitlab.com/yawning/obfs4.git/common/ntor"
 
 import (
 	"bytes"
@@ -43,12 +43,10 @@ import (
 	"fmt"
 	"io"
 
+	"github.com/agl/ed25519/extra25519"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/hkdf"
-
-	"github.com/agl/ed25519/extra25519"
-
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
 )
 
 const (

common/probdist/weighted_dist.go

@@ -28,7 +28,7 @@
 // Package probdist implements a weighted probability distribution suitable for
 // protocol parameterization.  To allow for easy reproduction of a given
 // distribution, the drbg package is used as the random number source.
-package probdist
+package probdist // import "gitlab.com/yawning/obfs4.git/common/probdist"
 
 import (
 	"bytes"
@@ -37,8 +37,8 @@ import (
 	"math/rand"
 	"sync"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
 )
 
 const (

common/probdist/weighted_dist_test.go

@@ -31,7 +31,7 @@ import (
 	"fmt"
 	"testing"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
 )
 
 const debug = false

common/replayfilter/replay_filter.go

@@ -30,7 +30,7 @@
 // has been seen before based on the SipHash-2-4 digest of the sequence.
 // Collisions are treated as positive matches, though the probability of this
 // happening is negligible.
-package replayfilter
+package replayfilter // import "gitlab.com/yawning/obfs4.git/common/replayfilter"
 
 import (
 	"container/list"
@@ -39,8 +39,7 @@ import (
 	"time"
 
 	"github.com/dchest/siphash"
-
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
 )
 
 // maxFilterSize is the maximum capacity of a replay filter.  This value is

common/socks5/socks5.go

@@ -35,7 +35,7 @@
 //  * The authentication provided by the client is always accepted as it is
 //    used as a channel to pass information rather than for authentication for
 //    pluggable transports.
-package socks5
+package socks5 // import "gitlab.com/yawning/obfs4.git/common/socks5"
 
 import (
 	"bufio"

common/uniformdh/uniformdh.go

@@ -29,7 +29,7 @@
 // mechanism as defined in the obfs3 protocol specification.  This
 // implementation is suitable for obfuscation but MUST NOT BE USED when strong
 // security is required as it is not constant time.
-package uniformdh
+package uniformdh // import "gitlab.com/yawning/obfs4.git/common/uniformdh"
 
 import (
 	"fmt"

go.mod

@@ -1,4 +1,4 @@
-module git.torproject.org/pluggable-transports/obfs4.git
+module gitlab.com/yawning/obfs4.git
 
 require (
 	git.torproject.org/pluggable-transports/goptlib.git v0.0.0-20180321061416-7d56ec4f381e

obfs4proxy/obfs4proxy.go

@@ -41,13 +41,12 @@ import (
 	"sync"
 	"syscall"
 
-	"golang.org/x/net/proxy"
-
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/log"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/socks5"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/common/log"
+	"gitlab.com/yawning/obfs4.git/common/socks5"
+	"gitlab.com/yawning/obfs4.git/transports"
+	"gitlab.com/yawning/obfs4.git/transports/base"
+	"golang.org/x/net/proxy"
 )
 
 const (

obfs4proxy/proxy_http.go

@@ -93,7 +93,7 @@ func (s *httpProxy) Dial(network, addr string) (net.Conn, error) {
 	if s.haveAuth {
 		// SetBasicAuth doesn't quite do what is appropriate, because
 		// the correct header is `Proxy-Authorization`.
-		req.Header.Set("Proxy-Authorization", base64.StdEncoding.EncodeToString([]byte(s.username + ":" + s.password)))
+		req.Header.Set("Proxy-Authorization", base64.StdEncoding.EncodeToString([]byte(s.username+":"+s.password)))
 	}
 	req.Header.Set("User-Agent", "")
 

obfs4proxy/termmon.go

@@ -36,7 +36,7 @@ import (
 	"syscall"
 	"time"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/log"
+	"gitlab.com/yawning/obfs4.git/common/log"
 )
 
 var termMonitorOSInit func(*termMonitor) error

transports/base/base.go

@@ -27,7 +27,7 @@
 
 // Package base provides the common interface that each supported transport
 // protocol must implement.
-package base
+package base // import "gitlab.com/yawning/obfs4.git/transports/base"
 
 import (
 	"net"

transports/meeklite/base.go

@@ -30,14 +30,14 @@
 // made to normalize the TLS fingerprint.
 //
 // It borrows quite liberally from the real meek-client code.
-package meeklite
+package meeklite // import "gitlab.com/yawning/obfs4.git/transports/meeklite"
 
 import (
 	"fmt"
 	"net"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/transports/base"
 )
 
 const transportName = "meek_lite"

transports/meeklite/meek.go

@@ -44,7 +44,7 @@ import (
 	"time"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/transports/base"
 )
 
 const (

transports/obfs2/obfs2.go

@@ -28,7 +28,7 @@
 // Package obfs2 provides an implementation of the Tor Project's obfs2
 // obfuscation protocol.  This protocol is considered trivially broken by most
 // sophisticated adversaries.
-package obfs2
+package obfs2 // import "gitlab.com/yawning/obfs4.git/transports/obfs2"
 
 import (
 	"crypto/aes"
@@ -41,8 +41,8 @@ import (
 	"time"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/transports/base"
 )
 
 const (

transports/obfs3/obfs3.go

@@ -27,7 +27,7 @@
 
 // Package obfs3 provides an implementation of the Tor Project's obfs3
 // obfuscation protocol.
-package obfs3
+package obfs3 // import "gitlab.com/yawning/obfs4.git/transports/obfs3"
 
 import (
 	"bytes"
@@ -41,9 +41,9 @@ import (
 	"time"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/uniformdh"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/uniformdh"
+	"gitlab.com/yawning/obfs4.git/transports/base"
 )
 
 const (

transports/obfs4/framing/framing.go

@@ -58,7 +58,7 @@
 // and the initial counter value.  It is imperative that the counter does not
 // wrap, and sessions MUST terminate before 2^64 frames are sent.
 //
-package framing
+package framing // import "gitlab.com/yawning/obfs4.git/transports/obfs4/framing"
 
 import (
 	"bytes"
@@ -67,10 +67,9 @@ import (
 	"fmt"
 	"io"
 
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
 	"golang.org/x/crypto/nacl/secretbox"
-
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
 )
 
 const (

transports/obfs4/handshake_ntor.go

@@ -38,10 +38,10 @@ import (
 	"strconv"
 	"time"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/ntor"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/replayfilter"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4/framing"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/ntor"
+	"gitlab.com/yawning/obfs4.git/common/replayfilter"
+	"gitlab.com/yawning/obfs4.git/transports/obfs4/framing"
 )
 
 const (

transports/obfs4/handshake_ntor_test.go

@@ -31,8 +31,8 @@ import (
 	"bytes"
 	"testing"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/ntor"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/replayfilter"
+	"gitlab.com/yawning/obfs4.git/common/ntor"
+	"gitlab.com/yawning/obfs4.git/common/replayfilter"
 )
 
 func TestHandshakeNtorClient(t *testing.T) {

transports/obfs4/obfs4.go

@@ -27,7 +27,7 @@
 
 // Package obfs4 provides an implementation of the Tor Project's obfs4
 // obfuscation protocol.
-package obfs4
+package obfs4 // import "gitlab.com/yawning/obfs4.git/transports/obfs4"
 
 import (
 	"bytes"
@@ -41,12 +41,12 @@ import (
 	"time"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/ntor"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/probdist"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/replayfilter"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4/framing"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
+	"gitlab.com/yawning/obfs4.git/common/ntor"
+	"gitlab.com/yawning/obfs4.git/common/probdist"
+	"gitlab.com/yawning/obfs4.git/common/replayfilter"
+	"gitlab.com/yawning/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/transports/obfs4/framing"
 )
 
 const (

transports/obfs4/packet.go

@@ -33,8 +33,8 @@ import (
 	"fmt"
 	"io"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4/framing"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
+	"gitlab.com/yawning/obfs4.git/transports/obfs4/framing"
 )
 
 const (

transports/obfs4/statefile.go

@@ -38,9 +38,9 @@ import (
 	"strings"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/ntor"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
+	"gitlab.com/yawning/obfs4.git/common/ntor"
 )
 
 const (

transports/scramblesuit/base.go

@@ -27,14 +27,14 @@
 
 // Package scramblesuit provides an implementation of the ScrambleSuit
 // obfuscation protocol.  The implementation is client only.
-package scramblesuit
+package scramblesuit // import "gitlab.com/yawning/obfs4.git/transports/scramblesuit"
 
 import (
 	"fmt"
 	"net"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/transports/base"
 )
 
 const transportName = "scramblesuit"

transports/scramblesuit/conn.go

@@ -43,10 +43,10 @@ import (
 	"time"
 
 	"git.torproject.org/pluggable-transports/goptlib.git"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/drbg"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/probdist"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/uniformdh"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/drbg"
+	"gitlab.com/yawning/obfs4.git/common/probdist"
+	"gitlab.com/yawning/obfs4.git/common/uniformdh"
 )
 
 const (

transports/scramblesuit/handshake_ticket.go

@@ -42,7 +42,7 @@ import (
 	"sync"
 	"time"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
 )
 
 const (

transports/scramblesuit/handshake_uniformdh.go

@@ -36,8 +36,8 @@ import (
 	"strconv"
 	"time"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/common/csrand"
-	"git.torproject.org/pluggable-transports/obfs4.git/common/uniformdh"
+	"gitlab.com/yawning/obfs4.git/common/csrand"
+	"gitlab.com/yawning/obfs4.git/common/uniformdh"
 )
 
 const (

transports/transports.go

@@ -27,18 +27,18 @@
 
 // Package transports provides a interface to query supported pluggable
 // transports.
-package transports
+package transports // import "gitlab.com/yawning/obfs4.git/transports"
 
 import (
 	"fmt"
 	"sync"
 
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/base"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/meeklite"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/obfs2"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/obfs3"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/obfs4"
-	"git.torproject.org/pluggable-transports/obfs4.git/transports/scramblesuit"
+	"gitlab.com/yawning/obfs4.git/transports/base"
+	"gitlab.com/yawning/obfs4.git/transports/meeklite"
+	"gitlab.com/yawning/obfs4.git/transports/obfs2"
+	"gitlab.com/yawning/obfs4.git/transports/obfs3"
+	"gitlab.com/yawning/obfs4.git/transports/obfs4"
+	"gitlab.com/yawning/obfs4.git/transports/scramblesuit"
 )
 
 var transportMapLock sync.Mutex