Merge remote-tracking branch 'weasel/bug19503'

This commit is contained in:
Nick Mathewson 2016-06-29 16:10:10 -04:00
commit 7602b0b31f
2 changed files with 4 additions and 1 deletions

3
changes/bug19503 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (user interface):
- Fix a typo in the getting passphrase prompt for the ed25519
identity key.

View File

@ -115,7 +115,7 @@ read_encrypted_secret_key(ed25519_secret_key_t *out,
while (1) {
ssize_t pwlen =
do_getpass("Enter pasphrase for master key:", pwbuf, sizeof(pwbuf), 0,
do_getpass("Enter passphrase for master key:", pwbuf, sizeof(pwbuf), 0,
get_options());
if (pwlen < 0) {
saved_errno = EINVAL;