Merge pull request #16636 from fabpot/release-2.6.12

fabpot · fabpot · commit 9d1072d0706a · 2015-11-23T12:39:53.000+01:00
Release v2.6.12
diff --git a/CHANGELOG-2.6.md b/CHANGELOG-2.6.md
@@ -7,6 +7,11 @@ in 2.6 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.6.0...v2.6.1
 
+* 2.6.12 (2015-11-23)
+
+ * security #16631 CVE-2015-8124: Session Fixation in the "Remember Me" Login Feature (xabbuh)
+ * security #16630 CVE-2015-8125: Potential Remote Timing Attack Vulnerability in Security Remember-Me Service (xabbuh)
+
 * 2.6.11 (2015-07-26)
 
  * bug #15361 [Yaml] throw a ParseException on invalid data type (xabbuh)
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -60,11 +60,11 @@ abstract class Kernel implements KernelInterface, TerminableInterface
     protected $startTime;
     protected $loadClassCache;
 
-    const VERSION = '2.6.11';
-    const VERSION_ID = '20611';
+    const VERSION = '2.6.12';
+    const VERSION_ID = '20612';
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '6';
-    const RELEASE_VERSION = '11';
+    const RELEASE_VERSION = '12';
     const EXTRA_VERSION = '';
 
     /**
