summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-06-29 16:10:10 -0400
committerNick Mathewson <nickm@torproject.org>2016-06-29 16:10:10 -0400
commit7602b0b31f8ba0d080f84bcb700db0100efcb26f (patch)
tree180ee0d23e6cdea05c943eb833f704d588c6c750 /src
parent79b2ba85984aae5bb6832db97bdff682a27634cb (diff)
parent54c3066c72aed043f65c6e02c3c92015f8e4b465 (diff)
downloadtor-7602b0b31f8ba0d080f84bcb700db0100efcb26f.tar.gz
tor-7602b0b31f8ba0d080f84bcb700db0100efcb26f.zip
Merge remote-tracking branch 'weasel/bug19503'
Diffstat (limited to 'src')
-rw-r--r--src/or/routerkeys.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index fba3491f2b..12de8c5e7a 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -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;