From 9d0b492642a40dabde96b61dc3f7af0b6f845f7c Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@zerotier.com>
Date: Mon, 30 Nov 2020 16:06:07 -0500
Subject: [PATCH] Version bump.

---
 RELEASE-NOTES.md                          | 5 +++++
 debian/changelog                          | 6 ++++++
 ext/installfiles/mac/ZeroTier One.pkgproj | 2 +-
 version.h                                 | 2 +-
 windows/WinUI/AboutView.xaml              | 2 +-
 zerotier-one.spec                         | 5 ++++-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 16f677618..2df65f7c7 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,6 +1,11 @@
 ZeroTier Release Notes
 ======
 
+# 2020-11-30 -- Version 1.6.2
+
+ * Fix an ARM hardware AES crypto issue (not an exploitable vulnerability).
+ * Fix a Linux network leave hang due to a mutex deadlock.
+
 # 2020-11-24 -- Version 1.6.1
 
 This release fixes some minor bugs and other issues in 1.6.0.
diff --git a/debian/changelog b/debian/changelog
index da41dbf27..adddbc4af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.6.2) unstable; urgency=medium
+
+  * See RELEASE-NOTES.md for release notes.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Mon, 30 Nov 2020 01:00:00 -0700
+
 zerotier-one (1.6.1) unstable; urgency=medium
 
   * See RELEASE-NOTES.md for release notes.
diff --git a/ext/installfiles/mac/ZeroTier One.pkgproj b/ext/installfiles/mac/ZeroTier One.pkgproj
index 3be5ac341..6f728fcbe 100755
--- a/ext/installfiles/mac/ZeroTier One.pkgproj	
+++ b/ext/installfiles/mac/ZeroTier One.pkgproj	
@@ -689,7 +689,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.6.1</string>
+				<string>1.6.2</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
diff --git a/version.h b/version.h
index bef75b186..997083e39 100644
--- a/version.h
+++ b/version.h
@@ -27,7 +27,7 @@
 /**
  * Revision
  */
-#define ZEROTIER_ONE_VERSION_REVISION 1
+#define ZEROTIER_ONE_VERSION_REVISION 2
 
 /**
  * Build version
diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml
index 09958402b..47dd201bf 100644
--- a/windows/WinUI/AboutView.xaml
+++ b/windows/WinUI/AboutView.xaml
@@ -19,7 +19,7 @@
                     <Run Text="ZeroTier One"/>
                 </Paragraph>
                 <Paragraph TextAlignment="Center">
-                    <Run FontSize="14" Text="Version 1.6.1"/>
+                    <Run FontSize="14" Text="Version 1.6.2"/>
                     <LineBreak/>
                     <Run FontSize="14" Text="(c) 2011-2020 ZeroTier, Inc."/>
                     <LineBreak/>
diff --git a/zerotier-one.spec b/zerotier-one.spec
index e415bbb54..d29a15564 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
 Name:           zerotier-one
-Version:        1.6.1
+Version:        1.6.2
 Release:        1%{?dist}
 Summary:        ZeroTier network virtualization service
 
@@ -152,6 +152,9 @@ esac
 %endif
 
 %changelog
+* Mon Nov 30 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.2-0.1
+- see https://github.com/zerotier/ZeroTierOne for release notes
+
 * Tue Nov 24 2020 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.6.1-0.1
 - see https://github.com/zerotier/ZeroTierOne for release notes