Merge branch 'master' into canon-cache-size

This commit is contained in:
Robert Habermeier
2016-10-07 12:42:51 +02:00
13 changed files with 231 additions and 101 deletions

View File

@@ -44,7 +44,8 @@ Account Options:
ACCOUNTS is a comma-delimited list of addresses.
Implies --no-signer. (default: {flag_unlock:?})
--password FILE Provide a file containing a password for unlocking
an account. (default: {flag_password:?})
an account. Leading and trailing whitespace is trimmed.
(default: {flag_password:?})
--keys-iterations NUM Specify the number of iterations to use when
deriving key from the password (bigger is more
secure) (default: {flag_keys_iterations}).