Merge branch 'dbus-1.6'

Conflicts:
	NEWS

diff --cc NEWS
index cf24c1166e902cf73324f895175dbee6a7e6df94,96d4b0c2f831f764588fd41ae747dfa96a918f75..3fe6c0e414662dc9d2bb2106851cc4602620604b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,17 +1,17 @@@
 -D-Bus 1.6.14 (UNRELEASED)
 +D-Bus 1.7.6 (UNRELEASED)
  ==
  
- ...
+ Fixes:
+ 
+ • If malloc() returns NULL in _dbus_string_init() or similar, don't free
+   an invalid pointer if the string is later freed (fd.o #65959, Chengwei Yang)
  
 -D-Bus 1.6.12 (2013-06-13)
 +D-Bus 1.7.4 (2013-06-13)
  ==
  
 -The “does this unit have a soul?” release.
 +The “but is your thread-safety thread-safe?” release.
  
 -Fixes:
 +Security fixes:
  
  • CVE-2013-2168: Fix misuse of va_list that could be used as a denial
    of service for system services. Vulnerability reported by Alexandru Cornea.