Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Roger Dingledine 2018-01-05 18:26:14 -05:00
commit 0d172c1182

View File

@ -2877,10 +2877,10 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len)
/* Useful log message for errno. */ /* Useful log message for errno. */
if (errno == ENOSYS) { if (errno == ENOSYS) {
log_warn(LD_CRYPTO, "Can't get entropy from getrandom(). " log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."
" You are running a version of Tor built to support" " You are running a version of Tor built to support"
" getrandom(), but the kernel doesn't implement this" " getrandom(), but the kernel doesn't implement this"
" implement this function--probably because it is too old?"); " function--probably because it is too old?");
} else { } else {
log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.",
strerror(errno)); strerror(errno));