Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Feb 1, 2016

Several patches missed master somehow. This pull will sync master with 0.12.

sipa and others added 3 commits February 1, 2016 15:28
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 46dbcd4)
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 8e09f91)
@laanwj
Copy link
Member

laanwj commented Feb 1, 2016

@laanwj
Copy link
Member

laanwj commented Feb 1, 2016

ACK #7387 for master

@gmaxwell do you think it makes sense to merge #7438 into master or will that just complicate getting #7082 merged?

@laanwj
Copy link
Member

laanwj commented Feb 2, 2016

Gmaxwell told me on IRC that it wasn't a problem: also ACK #7438 for master.

@laanwj laanwj merged commit 1e05727 into bitcoin:master Feb 2, 2016
laanwj added a commit that referenced this pull request Feb 2, 2016
1e05727 Decide eviction group ties based on time. (Gregory Maxwell)
1e9613a Do not absolutely protect local peers from eviction. (Gregory Maxwell)
5d74309 Get rid of inaccurate ScriptSigArgsExpected (Pieter Wuille)
@maflcko maflcko deleted the Mf1601-013Forwardports branch February 2, 2016 12:36
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants