From e7e177a6fa1e1ca22ba37558df03722f003d3d04 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Wed, 17 Jul 2019 10:55:28 +0200
Subject: [PATCH] lib/relay: Prevent spurious relay error message (fixes #5861)
 (#5864)

---
 lib/relay/client/dynamic.go | 3 +--
 lib/relay/client/static.go  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/relay/client/dynamic.go b/lib/relay/client/dynamic.go
index 314882f58..6a3751b32 100644
--- a/lib/relay/client/dynamic.go
+++ b/lib/relay/client/dynamic.go
@@ -169,8 +169,7 @@ func relayAddressesOrder(input []string) []string {
 
 	sort.Ints(ids)
 
-	addresses := make([]string, len(input))
-
+	addresses := make([]string, 0, len(input))
 	for _, id := range ids {
 		addresses = append(addresses, buckets[id]...)
 	}
diff --git a/lib/relay/client/static.go b/lib/relay/client/static.go
index dc023aa56..c6cbdc7f7 100644
--- a/lib/relay/client/static.go
+++ b/lib/relay/client/static.go
@@ -145,7 +145,7 @@ func (c *staticClient) URI() *url.URL {
 
 func (c *staticClient) connect() error {
 	if c.uri.Scheme != "relay" {
-		return fmt.Errorf("Unsupported relay schema: %v", c.uri.Scheme)
+		return fmt.Errorf("unsupported relay scheme: %v", c.uri.Scheme)
 	}
 
 	t0 := time.Now()
@@ -196,7 +196,7 @@ func (c *staticClient) join() error {
 	switch msg := message.(type) {
 	case protocol.Response:
 		if msg.Code != 0 {
-			return fmt.Errorf("Incorrect response code %d: %s", msg.Code, msg.Message)
+			return fmt.Errorf("incorrect response code %d: %s", msg.Code, msg.Message)
 		}
 
 	case protocol.RelayFull: