Merge branch 'release-v8.2.6'

bstansell · Oct 20, 2020 · c8355ae · c8355ae
2 parents 780daa7 + d8bf1d9
commit c8355ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,12 @@
                                 CHANGES
                                 =======
 
+version 8.2.6 (October 19, 2020):
+        - try and address license concerns with LICENSE.md
+        - replace usleep with nanosleep (Rosen Penev <rosenp@gmail.com>)
+        - console: Add 'k' option to exit on console-down (Mylène Josserand <mylene.josserand@collabora.com>)
+        - Fix #48 - apply ipv4 CIDR access list when compiled with ipv6 support 
+
 version 8.2.5 (May 1, 2020):
         - support SO_PEERCRED as well as ucred (Stuart Henderson <stu@spacehopper.org>)
         - fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0 (Stuart Henderson <stu@spacehopper.org>)

diff --git a/conserver/version.h b/conserver/version.h
@@ -12,9 +12,9 @@
 @(#) Copyright 2000 conserver.com.\n\
 All rights reserved.\n"
 
-#define VERSION_DATE	"2020/05/01"
+#define VERSION_DATE	"2020/10/19"
 #define VERSION_MAJOR	8
 #define VERSION_MINOR	2
-#define VERSION_REV	5
+#define VERSION_REV	6
 #define VERSION_TEXT	"conserver.com version"
 #define VERSION_UINT	(VERSION_MAJOR * 1000000 + VERSION_MINOR * 1000 + VERSION_REV)