Merge branch 'v3.2/dev' into release-v3.2

Author: lifeforms

CHANGES

@@ -5,6 +5,7 @@
   or the CRS mailinglist at
 * https://lists.owasp.org/mailman/listinfo/owasp-modsecurity-core-rule-set
 
+<<<<<<< HEAD
 == Version 3.2.0 - 9/20/2019 ==
 
 New functionality:
@@ -158,6 +159,18 @@ Documentation:
  * Update README.md (Rufus125)
  * Updating crs site location (Chaim Sanders)
 
+||||||| merged common ancestors
+=======
+== Version 3.1.1 - 2019-06-26 ==
+ * Fix CVE-2019-11387 ReDoS against CRS on ModSecurity 3 at PL 2 (Christoph Hansen, Federico G. Schwindt)
+ * Content-Type made case insensitive in 920240, 920400 (Federico G. Schwindt)
+ * Allow % encoding in 920240 (Christoph Hansen)
+ * Fix bug in 920440 (Andrea Menin)
+ * Fix bug in 920470 (Walter Hop)
+ * Reduce false positives in 921110 (Yu Yagihashi, Federico G. Schwindt)
+ * Fix bug in 943120 (XeroChen)
+
+>>>>>>> v3.2/dev
 == Version 3.1.0 - 8/7/2018 ==
  * Add Detectify scanner (theMiddle)
  * Renaming matched_var/s (Victor Hora)