Nikolay Dobromirov authored Dec 30, 2015 and Rick Hawkins committed Dec 30, 2015

Issue #2632668 by ndobromirov: encrypt_get_default_config should propagate the reset flag to encrypt_get_config

Issue #2371789 by rlhawk, Cellar Door: Make configuration available in the encryption callback function.

Issue #1813524 by greggles: Allow sites to use a variable other than the drupal_get_private_key variable

Issue #1811428 by greggles: file.inc not appending the filename, but settings requires a directory and not a filename

Issue #1775734 by greggles: Try to use base64 by default in ecryptfapi.module to store text in a more reliable form