Merge branch '3.4' into 4.2

* 3.4:
  [Security] Add a separator in the remember me cookie hash

Author: nicolas-grekas

Http/RememberMe/TokenBasedRememberMeServices.php

@@ -122,6 +122,6 @@ protected function generateCookieValue($class, $username, $expires, $password)
      */
     protected function generateCookieHash($class, $username, $expires, $password)
     {
-        return hash_hmac('sha256', $class.$username.$expires.$password, $this->getSecret());
+        return hash_hmac('sha256', $class.self::COOKIE_DELIMITER.$username.self::COOKIE_DELIMITER.$expires.self::COOKIE_DELIMITER.$password, $this->getSecret());
     }
 }