Several patches missed master somehow. This pull will sync master with 0.12.
[0.13] Missing patches from 0.12 #7453
pull MarcoFalke wants to merge 3 commits into bitcoin:master from MarcoFalke:Mf1601-013Forwardports changing 6 files +16 −78-
MarcoFalke commented at 2:33 PM on February 1, 2016: member
-
5d743099b5
Get rid of inaccurate ScriptSigArgsExpected
(cherry picked from commit 52b29dca7670c3f6d2ab918c0fff1d17c4e494ad)
-
1e9613ac09
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)
-
1e05727072
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)
- laanwj merged this on Feb 2, 2016
- laanwj closed this on Feb 2, 2016
- laanwj referenced this in commit 3dc3149e63 on Feb 2, 2016
- MarcoFalke deleted the branch on Feb 2, 2016
- MarcoFalke locked this on Sep 8, 2021