Merge branch 'dbus-1.6'

Conflicts:
	NEWS

diff --cc NEWS
index 4c91dccb7a949a2b67b091728416fba712cde452,150a5344e9d2a84d706da559103ad348c34f4dfc..3b7894fed71cb348492fb44d5b36b26cc9b802d3
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,31 -1,11 +1,34 @@@
 -D-Bus 1.6.14 (UNRELEASED)
 +D-Bus 1.7.6 (UNRELEASED)
  ==
  
 +Build-time configuration changes:
 +
 +• Directory change notification via dnotify on Linux is no longer
 +  supported; it hadn't compiled successfully since 2010 in any case.
 +  If you don't have inotify (Linux) or kqueue (*BSD), you will need
 +  to send SIGHUP to the dbus-daemon when its configuration changes.
 +  (fd.o #33001, Chengwei Yang)
 +
 +• The DBUS_DISABLE_ASSERTS CMake option didn't actually disable most
 +  assertions. It has been renamed to DBUS_DISABLE_ASSERT to be consistent
 +  with the Autotools build system. (fd.o #66142, Chengwei Yang)
 +
 +Enhancements:
 +
 +• Be thread-safe by default on all platforms, even if
 +  dbus_threads_init_default() has not been called. For compatibility with
 +  older libdbus, library users should continue to call
 +  dbus_threads_init_default(): it is harmless to do so.
 +  (fd.o #54972, Simon McVittie)
 +
  Fixes:
  
+ • Escape addresses containing non-ASCII characters correctly
+   (fd.o #53499, Chengwei Yang)
+ 
 +• Don't crash on "dbus-send --session / x.y.z" which regressed in 1.7.4.
 +  (fd.o #65923, Chengwei Yang)
 +
  • 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)
  

diff --cc dbus/dbus-address.c
Simple merge

diff --cc dbus/dbus-string.c
Simple merge