From 06ed114fb698c797ea4e36d8c0b5e86e7eb3eb5b Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Wed, 15 Dec 2021 12:32:28 -0500
Subject: [PATCH] Release notes and GitHub issue #1512

---
 RELEASE-NOTES.md | 5 +++++
 node/Peer.cpp    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 4845c68af..7718ec561 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,11 @@
 ZeroTier Release Notes
 ======
 
+# 2021-12-15 -- Version 1.8.5
+
+ * Fix an issue that could cause self-hosted roots ("moons") to fail to assist peers in making direct links. (GitHub issue #1512)
+ * Merge a series of changes by Joseph Henry (of ZeroTier) that should fix some edge cases where ZeroTier would "forget" valid paths.
+
 # 2021-11-30 -- Version 1.8.4
 
  * Fixed an ugly font problem on some older macOS versions.
diff --git a/node/Peer.cpp b/node/Peer.cpp
index ab4cb7c51..8ab51687d 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -409,7 +409,7 @@ void Peer::introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &o
 					outp.append((uint8_t)4);
 					outp.append(_paths[mine].p->address().rawIpData(),4);
 				}
-				outp.armor(other->_key,true,aesKeysIfSupported());
+				outp.armor(other->_key,true,other->aesKeysIfSupported());
 				other->_paths[theirs].p->send(RR,tPtr,outp.data(),outp.size(),now);
 			}
 			++alt;