aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2019-02-14 21:30:42 +0200
committerRiccardo Spagni <ric@spagni.net>2019-02-14 21:30:42 +0200
commitb9b54dffbe328a05ea54b46fda9a8e1ec75511a9 (patch)
tree65e1d7953c4cd82ae6bd1e0f92799d43ad539d23 /contrib/epee
parentMerge pull request #4716 (diff)
parentBuild fixes for some platforms (diff)
downloadmonero-b9b54dffbe328a05ea54b46fda9a8e1ec75511a9.tar.xz
Merge pull request #5144
0b0fb709 Build fixes for some platforms (moneromooo-monero) 3ac3366a blockchain: add v10 fork heights (moneromooo-monero) c2b8037a Adding cnv4-2 tweaks (Lee Clagett) 1b77e80a Cryptonight variant 4 aka CryptonightR (SChernykh) b980fec4 slow-hash: some more big endian fixes (xiphon) cd22a02d slow-hash: fix for big endian (moneromooo-monero) 96f53815 Small function declaration cleanup in slow-hash.c (Pol Mauri) 612ecb13 Add support for V10 protocol with BulletProofV2 and short amount. (cslashm) 823b38bc Fix dummy decryption in debug mode (cslashm) 377de050 fix log namespace (cslashm) ff9853b4 New scheme key destination contrfol (cslashm) 041af954 cryptonote: Fix enum check in expand_transaction_2 (Tom Smeding) 1767c817 simplewallet: tell the user to complain to the recipient (moneromooo-monero) c2d0e9a1 ringct: fix v1 ecdhInfo serialization (moneromooo-monero) 0b18fa54 ringct: the commitment mask is now deterministic (moneromooo-monero) 6ba3a116 ringct: encode 8 byte amount, saving 24 bytes per output (moneromooo-monero) 77f8f454 ringct: save 3 bytes on bulletproof size (moneromooo-monero) f7f67600 add a bulletproof version, new bulletproof type, and rct config (moneromooo-monero) 5b07e0c9 core: include a dummy encrypted payment id when no payment is used (moneromooo-monero) 2eff9b12 core, wallet: remember original text version of destination address (moneromooo-monero) e10d12b6 simplewallet: disable long payment ids by default (moneromooo-monero) b84b350f blockchain: fix wrong hf version when popping multiple blocks (moneromooo-monero) 1c7650f4 simplewallet: remove ability to transfer with detached short payment ids (moneromooo-monero) 4a7917ef blockchain: fix block rate check for empty blockchains (moneromooo-monero) 34d2850f ignore child process when exec (Jethro Grassie) 5f89caea wallet2: fix ring reuse breaking when using histogram (moneromooo-monero) db1e0a53 core: fix unmixable special case allowing ring size below 11 (moneromooo-monero) 66772f12 blockchain: include number of discarded blocks in --reorg-notify (moneromooo-monero) af1ade4e core: add a few more block rate window sizes (moneromooo-monero) fb0dbab9 notify: fix tokenizing being too strict (moneromooo-monero) 0ac22d0e core: add --block-rate-notify (moneromooo-monero) 7d2f817f blockchain: add --reorg-notify (moneromooo-monero) 1168e8d5 cryptonote_core: warn when the block rate deviates from expectations (moneromooo-monero) 842a5d8b notify: handle arbitrary tags (moneromooo-monero) ebc60a09 ArticMine's new block weight algorithm (moneromooo-monero)
Diffstat (limited to 'contrib/epee')
-rw-r--r--contrib/epee/src/mlocker.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/contrib/epee/src/mlocker.cpp b/contrib/epee/src/mlocker.cpp
index 5573d591a..2d6e64e7a 100644
--- a/contrib/epee/src/mlocker.cpp
+++ b/contrib/epee/src/mlocker.cpp
@@ -47,7 +47,6 @@ static size_t query_page_size()
MERROR("Failed to determine page size");
return 0;
}
- MINFO("Page size: " << ret);
return ret;
#else
#warning Missing query_page_size implementation