Merge pull request #7555

pull vlamer wants to merge 14 commits into bitcoin:master from vlamer:master changing 1 files +1 −1

vlamer commented at 5:33 PM on February 18, 2016: none

No description provided.
Update clientversion.cpp
my name node :D
42bc423b47
Update clientversion.cpp
my name node :D
a31c1be563
Merge branch 'master' of github:/vlamer/bitcoin e3bb29cf98
Build: Consensus: Move consensus files from common to its own module/package eb9ce5514c
Build: Libconsensus: Move libconsensus-ready files to the consensus package fd405b341a

Build: Consensus: Make libbitcoinconsensus_la_SOURCES fully dynamic and dependend on both crypto and consensus packages

Some extra bytes in libconsensus to get all the crypto (except for signing, which is in the common module) below the libconsensus future independent repo (that has libsecp256k1 as a subtree).
hmac_sha256.o seems to be the only thing libbitcoinconsensus doesn't depend on from crypto, some more bytes for the final libconsensus: I'm not personally worried.

81bdc15b94

MOVEONLY: non-consensus: from pow to chain:
- GetBlockProof - GetBlockProofEquivalentTime
550414e01b
mempool: Replace maxFeeRate of 10000*minRelayTxFee with maxTxFee 015ca0bf94

Get rid of inaccurate ScriptSigArgsExpected

(cherry picked from commit 52b29dca7670c3f6d2ab918c0fff1d17c4e494ad)

59dafeb723

Do not absolutely protect local peers from eviction.

With automatic tor HS support in place we should probably not be providing
 absolute protection for local peers, since HS inbound could be used to
 attack pretty easily.  Instead, this counts on the latency metric inside
 AttemptToEvictConnection to privilege actually local peers.

(cherry picked from commit 46dbcd4833115401fecbb052365b4c7725874414)

49b85152c3

Decide eviction group ties based on time.

This corrects a bug the case of tying group size where the code may
 fail to select the group with the newest member. Since newest time
 is the final selection criteria, failing to break ties on it
 on the step before can undermine the final selection.

Tied netgroups are very common.

(cherry picked from commit 8e09f914f8ec66301257358b250e9a61befadd95)

88618c2bce

[doxygen] Actually display comment cb6fa430f8
Merge remote-tracking branch 'upstream/master' 7a96babba3
Merge remote-tracking branch 'upstream/master' 77150a1af9
laanwj closed this on Feb 18, 2016
vlamer commented at 5:43 PM on February 18, 2016: none

im wrong ,use this tutorial https://webapps.stackexchange.com/questions/28998/how-do-you-update-a-github-repo-fork-in-the-web-interface
vlamer commented at 5:53 PM on February 18, 2016: none

@laanwj can you del this ..
MarcoFalke locked this on Sep 8, 2021

Contributors

vlamer