From e20e4e73a90487934b16718fec8a3f0cfd97e261 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Thu, 29 Sep 2016 14:52:32 +0200
Subject: [PATCH 1/5] Update multiformats imports

---
 README.md    | 2 +-
 codec.go     | 6 +++---
 doc.go       | 2 +-
 interface.go | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3c44f52..ab80e12 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ go get multiformats/multiaddr
 #### Simple
 
 ```go
-import ma "github.com/jbenet/go-multiaddr"
+import ma "github.com/multiformats/go-multiaddr"
 
 // construct from a string (err signals parse failure)
 m1, err := ma.NewMultiaddr("/ip4/127.0.0.1/udp/1234")
diff --git a/codec.go b/codec.go
index 36de467..3fc7dd2 100644
--- a/codec.go
+++ b/codec.go
@@ -4,13 +4,13 @@ import (
 	"bytes"
 	"encoding/base32"
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"net"
 	"strconv"
 	"strings"
-	"errors"
 
-	mh "github.com/jbenet/go-multihash"
+	mh "github.com/multiformats/go-multihash"
 )
 
 func stringToBytes(s string) ([]byte, error) {
@@ -298,7 +298,7 @@ func addressBytesToString(p Protocol, b []byte) (string, error) {
 	case P_ONION:
 		addr := strings.ToLower(base32.StdEncoding.EncodeToString(b[0:10]))
 		port := binary.BigEndian.Uint16(b[10:12])
-		return addr + ":"+ strconv.Itoa(int(port)), nil
+		return addr + ":" + strconv.Itoa(int(port)), nil
 
 	case P_UNIX:
 		// the address is a varint len prefixed string
diff --git a/doc.go b/doc.go
index c26e443..b82f0e5 100644
--- a/doc.go
+++ b/doc.go
@@ -10,7 +10,7 @@ Basic Use:
   import (
     "bytes"
     "strings"
-    ma "github.com/jbenet/go-multiaddr"
+    ma "github.com/multiformats/go-multiaddr"
   )
 
   // construct from a string (err signals parse failure)
diff --git a/interface.go b/interface.go
index 18de2a2..f8f2f6a 100644
--- a/interface.go
+++ b/interface.go
@@ -7,7 +7,7 @@ Learn more here: https://github.com/jbenet/multiaddr
 
 Multiaddrs have both a binary and string representation.
 
-    import ma "github.com/jbenet/go-multiaddr"
+    import ma "github.com/multiformats/go-multiaddr"
 
     addr, err := ma.NewMultiaddr("/ip4/1.2.3.4/tcp/80")
     // err non-nil when parsing failed.

From 16fe749936bb344b8e7d38ee28f1531f5da50eb9 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Thu, 29 Sep 2016 15:02:17 +0200
Subject: [PATCH 2/5] Add gx release cmd

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2e845ea..89aec23 100644
--- a/package.json
+++ b/package.json
@@ -10,5 +10,6 @@
   "language": "go",
   "license": "MIT",
   "name": "go-multiaddr",
+  "releaseCmd": "git commit -a -m 'gx publish $VERSION'",
   "version": "1.1.0"
 }

From 26c0624fc0afd3d99a3c86f68619903584f197dc Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Thu, 29 Sep 2016 15:23:47 +0200
Subject: [PATCH 3/5] Update CI go versions

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4475888..a2dcd64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: go
 
 go:
   - tip
-  - 1.6.1
+  - 1.7
 
 script:
   - go test -race -cpu=5 -v ./...

From e81c7060ff70f3f3ff052c4836c9e90ce94cfe1d Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Thu, 29 Sep 2016 15:24:05 +0200
Subject: [PATCH 4/5] Add go-multihash gx dep

---
 package.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package.json b/package.json
index 89aec23..1beea9a 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,13 @@
   "gx": {
     "dvcsimport": "github.com/multiformats/go-multiaddr"
   },
+  "gxDependencies": [
+    {
+      "hash": "QmTvWHtHQhkRD33UNzP3NKsUxX2k2oonrgHXYis7wdhCbA",
+      "name": "go-multihash",
+      "version": "0.1.0"
+    }
+  ],
   "gxVersion": "0.9.0",
   "language": "go",
   "license": "MIT",

From ee4596af4a2f7fd3eb1e54e1cda0c15ecdcd5b9a Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Thu, 29 Sep 2016 15:25:02 +0200
Subject: [PATCH 5/5] gx release v1.1.1

---
 .gx/lastpubver | 2 +-
 package.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gx/lastpubver b/.gx/lastpubver
index 5b19eff..92e223c 100644
--- a/.gx/lastpubver
+++ b/.gx/lastpubver
@@ -1 +1 @@
-1.1.0: QmRWzPoJjoEfhbNNiADWGL4WrTe7vF1ob2fYDcvNgeWuVM
+1.1.1: QmTKShqzu4Sr5trPY8KN7DihwFMaPMX78RZbrSZ8M3rSf9
diff --git a/package.json b/package.json
index 1beea9a..1bdecf6 100644
--- a/package.json
+++ b/package.json
@@ -18,5 +18,5 @@
   "license": "MIT",
   "name": "go-multiaddr",
   "releaseCmd": "git commit -a -m 'gx publish $VERSION'",
-  "version": "1.1.0"
+  "version": "1.1.1"
 }