tidying up code paths and making detport selection a little better

listener.go

@@ -8,14 +8,15 @@
 package bulb
 
 import (
+	"crypto"
 	goodrand "crypto/rand"
+	"encoding/binary"
 	"fmt"
+	"golang.org/x/crypto/sha3"
+	"log"
 	"net"
 	"strconv"
-	"golang.org/x/crypto/sha3"
+)
-			"encoding/binary"
-			"crypto"
-	)
 
 type onionAddr struct {
 	info *OnionInfo
@@ -86,6 +87,7 @@ func (c *Conn) RecoverListener(config *NewOnionConfig, onion string, vports ...u
 	if port < 1024 { // this is not uniformly random, but we don't need it to be
 		port += 1024
 	}
+	log.Printf("using local port: %d\n", port)
 	var loopbackAddr = "127.0.0.1:" + strconv.Itoa(port)
 
 	// Listen on the loopback interface.

status.go

@@ -9,8 +9,8 @@ package bulb
 
 import (
 	"fmt"
-	"strings"
 	"net/textproto"
+	"strings"
 )
 
 // The various control port StatusCode constants.