From b354607aedcac511caf348e68c10535099c82579 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 8 Dec 2010 15:19:13 +0100
Subject: [PATCH] release-preps: CHANGES and RELEASE-NOTES synced

---
 CHANGES       | 19 +++++++++++++++++++
 RELEASE-NOTES | 21 +++++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 166de80de..f739b4687 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,24 @@
   Changelog for the c-ares project
 
+Version 1.7.4 (December 9, 2010)
+
+Changed:
+
+ o local-bind: Support binding to local interface/IPs, see
+   ares_set_local_ip4, ares_set_local_ip6, ares_set_local_dev
+
+Fixed:
+
+ o memory leak in ares_getnameinfo
+ o add missing break that caused get_ares_servers to fail
+ o ares_parse_a_reply: fix CNAME response parsing
+ o init_by_options: don't copy an empty sortlist
+ o Replaced uint32_t with unsigned int to fix broken builds
+   on a couple of platforms
+ o Fix lookup with HOSTALIASES set
+ o adig: fix NAPTR parsing
+ o compiler warning cleanups
+
 Version 1.7.3 (June 11, 2010)
 
 Fixed:
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d7ac79063..639a314e1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,12 +1,25 @@
-c-ares version 1.7.3
+c-ares version 1.7.4
+
+Changed:
+
+ o local-bind: Support binding to local interface/IPs, see
+   ares_set_local_ip4, ares_set_local_ip6, ares_set_local_dev
 
 Fixed:
 
- o builds on Android
- o now includes all files necessary to build it (1.7.2 lacked a file)
+ o memory leak in ares_getnameinfo
+ o add missing break that caused get_ares_servers to fail
+ o ares_parse_a_reply: fix CNAME response parsing
+ o init_by_options: don't copy an empty sortlist
+ o Replaced uint32_t with unsigned int to fix broken builds
+   on a couple of platforms
+ o Fix lookup with HOSTALIASES set
+ o adig: fix NAPTR parsing
+ o compiler warning cleanups
 
 Thanks go to these friendly people for their efforts and contributions:
 
- Yang Tse, Bogdan Vatra
+ Andrew C. Morrow, Ben Greear, Ben Noordhuis, Daniel Stenberg,
+ Guenter Knauf, Mike Crowe, Patrik Thunstrom, Yang Tse
 
 Have fun!