Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/doc/security-warnings.md
+++ b/doc/security-warnings.md
@@ -42,7 +42,7 @@ Wallet encryption is disabled, for several reasons:

 You should use full-disk encryption (or encryption of your home directory) to
 protect your wallet at rest, and should assume (even unprivileged) users who are
-runnng on your OS can read your wallet.dat file.
+running on your OS can read your wallet.dat file.

 Side-Channel Attacks
 --------------------