fix rebase

control.go

@@ -15,11 +15,7 @@ import (
 // Ensure that the atomic variable is aligned to a 64bit boundary
 // so that atomic operations can be applied on 32bit architectures.
 type controlConn struct {
-	connecting uint64
-
-	session *Session
-
-	conn atomic.Value
+	connecting int64
 
 	session *Session
 	conn    atomic.Value

events.go

@@ -110,7 +110,7 @@ func (s *Session) handleNodeEvent(frames []frame) {
 		}
 	}
 
-	for addr, f := range events {
+	for _, f := range events {
 		switch f.change {
 		case "NEW_NODE":
 			s.handleNewNode(f.host, f.port)

session.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"strconv"
 	"strings"