build: update glide files to point to latest btcd+neutrino

glide.lock

@@ -2,6 +2,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 hash: 2fe59efc96b0a2839297653da88cde89208f8f8cf4ced2bb1e828def57e3611b
 updated: 2017-07-19T11:33:58.0769452-04:00
 =======
@@ -20,6 +21,10 @@ updated: 2017-06-29T21:02:00.000000000-07:00
 hash: ec2fde7c4ec4cd438d8c53646a41743440355e53bdd417192a9e9f1db49f19a2
 updated: 2017-08-24T17:24:41.5846735-07:00
 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits
+=======
+hash: cfe436dab405e09a50d3611edb83f5a238f71fd61c12ba7e47c2b02882a75cdf
+updated: 2017-08-29T15:22:10.322166424-07:00
+>>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino
 imports:
 - name: github.com/aead/siphash
   version: e404fcfc888570cadd1610538e2dbc89f66af814
@@ -105,7 +110,7 @@ imports:
 - name: github.com/btcsuite/websocket
   version: 31079b6807923eb23992c421b114992b95131b55
 - name: github.com/davecgh/go-spew
-  version: adab96458c51a58dc1783b3335dcce5461522e75
+  version: a476722483882dd40b8111f0eb64e1d7f43f56e4
   subpackages:
   - spew
 - name: github.com/golang/protobuf
@@ -136,12 +141,12 @@ imports:
 - name: github.com/kkdai/bstream
   version: f391b8402d23024e7c0f624b31267a89998fca95
 - name: github.com/lightninglabs/neutrino
-  version: a6610537e8121fdc82c46af04e8c79b78075cd03
+  version: 786bf194ce45d2619f23d7eafe90f23faf01b2f9
   subpackages:
   - filterdb
   - headerfs
 - name: github.com/roasbeef/btcd
-  version: ee68739ba4ed83f244b115bec0e176f5711b3e7a
+  version: 4b411f0e78f1faa96ae650d886170d018c1835bf
   subpackages:
   - addrmgr
   - blockchain
@@ -164,17 +169,21 @@ imports:
   - gcs/builder
   - hdkeychain
 - name: golang.org/x/crypto
-  version: eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035
+  version: 81e90905daefcd6fd217b62423c0908922eadb30
   subpackages:
   - ripemd160
   - ssh/terminal
 - name: golang.org/x/net
+<<<<<<< HEAD
 <<<<<<< HEAD
   version: 513929065c19401a1c7b76ecd942f9f86a0c061b
 >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet
 =======
   version: 57efc9c3d9f91fb3277f8da1cff370539c4d3dc5
 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits
+=======
+  version: 66aacef3dd8a676686c7ae3716979581e8b03c47
+>>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino
   subpackages:
   - context
   - http2
@@ -185,6 +194,7 @@ imports:
   - trace
 - name: golang.org/x/sys
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   version: cd2c276457edda6df7fb04895d3fd6a6add42926
   subpackages:
@@ -196,16 +206,23 @@ imports:
 =======
   version: 07c182904dbd53199946ba614a412c61d3c548f5
 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits
+=======
+  version: ab9e364efd8b52800ff7ee48a9ffba4e0ed78dfb
+>>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino
   subpackages:
   - unix
   - windows
 - name: golang.org/x/text
+<<<<<<< HEAD
 <<<<<<< HEAD
   version: 19e51611da83d6be54ddafce4a4af510cb3e9ea4
 >>>>>>> 4d479d4... Move spvchain into neutrino and start integration w/btcwallet
 =======
   version: cc24f0397b10b6321b1a1322b6bd592984fdabf2
 >>>>>>> ea0c0b9... build: update glide files to point to latest btcsuite/btcd commits
+=======
+  version: 18c65dde6afd36dbc39197ca72008895b8dfbfb6
+>>>>>>> e4e29cf... build: update glide files to point to latest btcd+neutrino
   subpackages:
   - secure/bidirule
   - transform

glide.yaml

@@ -3,7 +3,7 @@ import:
 - package: github.com/boltdb/bolt
   version: ^1.3.0
 - package: github.com/roasbeef/btcd
-  version: ee68739ba4ed83f244b115bec0e176f5711b3e7a
+  version: 4b411f0e78f1faa96ae650d886170d018c1835bf
   subpackages:
   - blockchain
   - btcec
@@ -18,7 +18,7 @@ import:
   subpackages:
   - hdkeychain
 - package: github.com/lightninglabs/neutrino
-  version: a6610537e8121fdc82c46af04e8c79b78075cd03
+  version: 786bf194ce45d2619f23d7eafe90f23faf01b2f9
 - package: github.com/btcsuite/golangcrypto
   subpackages:
   - nacl/secretbox