New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.13] Missing patches from 0.12 #7453

Merged
merged 3 commits into from Feb 2, 2016

Conversation

Projects
None yet
4 participants
@MarcoFalke
Member

MarcoFalke commented Feb 1, 2016

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

sipa and others added some commits Jan 21, 2016

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 46dbcd4)
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 8e09f91)
@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 1, 2016

Member
  • #7438 is a version of #7082 (which indeed still has to be merged)
  • #7387 has no counterpart for master, good catch
Member

laanwj commented Feb 1, 2016

  • #7438 is a version of #7082 (which indeed still has to be merged)
  • #7387 has no counterpart for master, good catch
@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 1, 2016

Member

ACK #7387 for master

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

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

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Feb 2, 2016

Member

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

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

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Feb 2, 2016

Merge #7453: [0.13] Missing patches from 0.12
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)

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1601-013Forwardports branch Feb 2, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment