Resolver - Just for review - Don't accept

Gopkg.toml

@@ -1,3 +1,7 @@
+[[override]]
+  name = "github.com/aead/siphash"
+  revision = "83563a290f60225eb120d724600b9690c3fb536f"
+
 [[constraint]]
   name = "github.com/btcsuite/btclog"
   revision = "84c8d2346e9fc8c7b947e243b9c24e6df9fd206a"
@@ -40,7 +44,7 @@
 
 [[constraint]]
   name = "github.com/lightninglabs/neutrino"
-  revision = "166fe699d5964581d24e6bfff0aa329cfb6a8bc9"
+  revision = "bee0ed11601a4ad0c3b23d462cd71089fc11f2cd"
 
 [[constraint]]
   name = "github.com/lightningnetwork/lightning-onion"
@@ -68,7 +72,7 @@
 
 [[constraint]]
   name = "github.com/btcsuite/btcwallet"
-  revision = "7b84dc25a61634c450d21ec7f47d5e916eb88fdb"
+  revision = "421298df22601db0fe4adb8f4be71b7014324ba9"
 
 [[constraint]]
   name = "github.com/tv42/zbase32"
@@ -90,6 +94,14 @@
   name = "golang.org/x/net"
   revision = "ae89d30ce0c63142b652837da33d782e2b0a9b25"
 
+[[override]]
+  name = "golang.org/x/sys"
+  revision = "ebe1bf3edb3325c393447059974de898d5133eb8"
+
+[[constraint]]
+  name = "golang.org/x/time"
+  revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
+
 [[constraint]]
   name = "google.golang.org/genproto"
   revision = "df60624c1e9b9d2973e889c7a1cff73155da81c4"
@@ -98,6 +110,10 @@
   name = "google.golang.org/grpc"
   revision = "b3ddf786825de56a4178401b7e174ee332173b66"
 
+[[override]]
+  name = "gopkg.in/errgo.v1"
+  revision = "b20caedf0710d0988e92b5f2d76843ad1f231f2d"
+
 [[constraint]]
   name = "gopkg.in/macaroon-bakery.v2"
   revision = "94012773d2874a067572bd16d7d11ae02968b47b"

Makefile

@@ -52,10 +52,10 @@ COVER = for dir in $(GOLISTCOVER); do \
 			-covermode=count \
 			-coverprofile=$$dir/profile.tmp $$dir; \
 		\
-		if [ $$? != 0 ] ;\
+		if [ $$? != 0 ] ; \
 		then \
 			exit 1; \
-		fi ;\
+		fi ; \
 		\
 		if [ -f $$dir/profile.tmp ]; then \
 			cat $$dir/profile.tmp | \
@@ -130,13 +130,13 @@ btcd: $(GLIDE_BIN) $(BTCD_DIR)
 
 build:
 	@$(call print, "Building debug lnd and lncli.")
-	$(GOBUILD) -tags=$(TEST_TAGS) -o lnd-debug $(LDFLAGS) $(PKG)
-	$(GOBUILD) -tags=$(TEST_TAGS) -o lncli-debug $(LDFLAGS) $(PKG)/cmd/lncli
+	$(GOBUILD) -tags="$(TEST_TAGS) ${tags}" -o lnd-debug $(LDFLAGS) $(PKG)
+	$(GOBUILD) -tags="$(TEST_TAGS) ${tags}" -o lncli-debug $(LDFLAGS) $(PKG)/cmd/lncli
 
 install:
 	@$(call print, "Installing lnd and lncli.")
-	go install -v $(LDFLAGS) $(PKG)
-	go install -v $(LDFLAGS) $(PKG)/cmd/lncli
+	go install -v -tags="${tags}" $(LDFLAGS) $(PKG)
+	go install -v -tags="${tags}" $(LDFLAGS) $(PKG)/cmd/lncli
 
 scratch: dep build
 
@@ -219,12 +219,12 @@ rpc:
 
 clean:
 	@$(call print, "Cleaning source.$(NC)")
-	$(RM) ./lnd ./lncli
-	$(RM) -r ./vendor
+	$(RM) ./lnd-debug ./lncli-debug
+	$(RM) -r ./vendor .vendor-new
 
 
 .PHONY: all \
-	btcd\
+	btcd \
 	default \
 	dep \
 	build \

README.md

@@ -75,6 +75,17 @@ discuss various aspects of `lnd` and also Lightning in general.
   * channel #lnd
   * [webchat](https://webchat.freenode.net/?channels=lnd)
 
+## Security
+
+The developers of `lnd` take security _very_ seriously. The disclosure of
+security vulnerabilities helps us security the health of `lnd`, privacy of our
+users, and also the health of the Lightning Network as a whole.  If you find
+any issues regarding security or privacy, please disclose the information
+responsibly by sending an email to security at lightning dot engineering,
+preferably [encrypted using our designated PGP key
+(`91FE464CD75101DA6B6BAB60555C6465E5BCB3AF`) which can be found
+here](https://pgp.mit.edu/pks/lookup?op=vindex&search=0x555C6465E5BCB3AF).
+
 ## Further reading
 * [Step-by-step send payment guide with docker](https://github.com/lightningnetwork/lnd/tree/master/docker)
 * [Contribution guide](https://github.com/lightningnetwork/lnd/blob/master/docs/code_contribution_guidelines.md)