From 42642a0badc5abd272d46d84196a8ab3589ab613 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 21 Jan 2017 09:13:09 +0100
Subject: [PATCH] Update NEWS/ChangeLog

---
 ChangeLog | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS      |  7 ++++++
 2 files changed, 72 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 2b93c176..49efc23d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,68 @@
+* Sat Jan 21 09:09:07 2017 +0100
+
+    "make clean" is not super interesting to log
+
+* Sat Jan 21 08:55:34 2017 +0100
+
+    Revert "New resolver in Tokyo, Japan: LifeTyper"
+    
+
+* Sat Jan 21 08:55:16 2017 +0100
+
+    Trusty is old
+
+* Sat Jan 21 08:49:23 2017 +0100
+
+    Travis doesn't support IPv6 yet
+
+* Sat Jan 21 08:48:56 2017 +0100
+
+    Travis: attempt install/uninstall + ./contrib/resolvers-check.sh
+
+* Sat Jan 21 08:45:58 2017 +0100
+
+    resolvers-check.sh: IPV4_ONLY can be set to probe only IPv4 resolvers
+
+* Sat Jan 21 08:12:53 2017 +0100
+
+    Move dnscrypt-update-resolvers.sh.in and resolvers-check.sh to contrib/
+
+* Sat Jan 21 08:11:41 2017 +0100
+
+    Update .gitignore
+
+* Sat Jan 21 08:05:08 2017 +0100
+
+    Use printunl/archlinux for the Windows builds
+
+* Sat Jan 21 02:59:46 2017 +0100
+
+    New resolver in Tokyo, Japan: LifeTyper
+
+* Sat Jan 21 02:54:08 2017 +0100
+
+    Use a random resolver in the tests
+
+* Sat Jan 21 02:48:59 2017 +0100
+
+    Indent
+
+* Sat Jan 21 02:45:03 2017 +0100
+
+    win32-win64-xcompile.sh: always compile from the script's directory
+
+* Sat Jan 21 01:52:27 2017 +0100
+
+    In the Windows dist, remove the sample conf, add WINDOWS doc
+
+* Sat Jan 21 00:00:55 2017 +0100
+
+    Update NEWS
+
+* Sat Jan 21 00:00:10 2017 +0100
+
+    Update ChangeLog
+
 * Fri Jan 20 23:58:24 2017 +0100
 
     Fix libsodium warning
diff --git a/NEWS b/NEWS
index 0ccba153..8c99be7e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,13 @@
 the configuration file with the example one. This has been fixed.
  - The resolver name can be set to "random" in order to pick a random resolver.
  - Paths are not hardcoded any more in the sample systemd and plist files.
+ - The dnscrypt-update-resolvers.sh and resolvers-check.sh scripts have been
+moved to the contrib/ directory.
+ - An IPV4_ONLY environment variable can be set to skip IPv6-only entries in
+resolvers-check.sh.
+ - Precompiled iOS/Android/Windows packages have become more consistent, and
+now include basic documentation.
+ - Tests are now run using random resolvers.
 
 * Version 1.9.3
  - This version can be compiled on Linux distributions using the musl C