Merge branch 'dbus-1.8'

Conflicts:
	NEWS

diff --cc NEWS
index 507c5b2,707f653..326031a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -25,11 -7,14 +25,17 @@@ Enhancements
    Windows D-Bus binaries to be able to run tests under Wine
    (fd.o #41252, Ralf Habacker)
  
 +• on Unix platforms, disable Nagle's algorithm on TCP connections to improve
 +  initial latency (fd.o #75544, Matt Hoosier)
 +
+ • add Documentation key to dbus.service (fd.o #77447, Cameron Norman)
+ 
  Fixes:
  
+ • in "dbus-uuidgen --ensure", try to copy systemd's /etc/machine-id
+   to /var/lib/dbus/machine-id instead of generating an entirely new ID
+   (fd.o #77941, Simon McVittie)
+ 
  • on Windows, allow up to 8K connections to the dbus-daemon, instead of the
    previous 64 (fd.o #71297; Cristian Onet, Ralf Habacker)
  

diff --cc dbus/dbus-sysdeps-unix.c
Simple merge