Merge from HEAD:

  Correct README.Debian's ForwardX11Trusted description (closes: #280190).

2 files changed, 2 insertions, 1 deletions

diff --git a/debian/README.Debian b/debian/README.Debian
index 4f076f898..db867e186 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -121,7 +121,7 @@ forwarded X11 connection can't become attacks on X clients on the remote
 machine. However, this has some problems in implementation - notably a
 very short timeout of the untrusted cookie - breaks large numbers of
 existing setups, and generally seems immature. The Debian package
-therefore sets the default for this option to "no" (in ssh itself,
+therefore sets the default for this option to "yes" (in ssh itself,
 rather than in ssh_config).
 
 Fallback to RSH
diff --git a/debian/changelog b/debian/changelog
index 41cddd823..caeeeeff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openssh (1:3.8.1p1-13) UNRELEASED; urgency=low
   * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
   * debconf template translations:
     - Update Dutch (thanks, cobaco; closes: #278715).
+  * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
 
  -- Colin Watson <cjwatson@debian.org>  Mon,  1 Nov 2004 18:09:08 +0000