svn commit: r1800386 - /subversion/branches/1.9.x/CHANGES

[da...@apache.org]

Author: danielsh
Date: Fri Jun 30 12:18:35 2017
New Revision: 1800386

URL: http://svn.apache.org/viewvc?rev=1800386&view=rev
Log:
* CHANGES: Sync with trunk, through r1800384.

Modified:
    subversion/branches/1.9.x/CHANGES   (contents, props changed)

Modified: subversion/branches/1.9.x/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/CHANGES?rev=1800386&r1=1800385&r2=1800386&view=diff
==============================================================================
--- subversion/branches/1.9.x/CHANGES (original)
+++ subversion/branches/1.9.x/CHANGES Fri Jun 30 12:18:35 2017
@@ -13,6 +13,10 @@ http://svn.apache.org/repos/asf/subversi
     * fsfs: improve error message upon failure to open rep-cache (r1781655)
     * fsfs: never attempt to share directory representations (r1785053)
     * fsfs: make consistency independent of hash algorithms (r1785737 et al)
+	This change makes Subversion resilient to collision attacks, including
+	SHA-1 collision attacks such as <http://shattered.io/>.  See also our
+	documentation at <https://subversion.apache.org/faq#shattered-sha1> and
+	<https://subversion.apache.org/docs/release-notes/1.9#shattered-sha1>.
 
   - Client-side and server-side bugfixes:
     * work around an APR bug related to file truncation (r1759116)

Propchange: subversion/branches/1.9.x/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 30 12:18:35 2017
@@ -89,4 +89,4 @@
 /subversion/branches/verify-at-commit/CHANGES:1462039-1462408
 /subversion/branches/verify-keep-going/CHANGES:1439280-1546110
 /subversion/branches/wc-collate-path/CHANGES:1402685-1480384
-/subversion/trunk/CHANGES:1660545-1800350
+/subversion/trunk/CHANGES:1660545-1800384