[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
  1. MarcoFalke commented at 2:33 pm on February 1, 2016: member
    Several patches missed master somehow. This pull will sync master with 0.12.
  2. Get rid of inaccurate ScriptSigArgsExpected
    (cherry picked from commit 52b29dca7670c3f6d2ab918c0fff1d17c4e494ad)
    5d743099b5
  3. 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)
    1e9613ac09
  4. 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)
    1e05727072
  5. laanwj commented at 2:37 pm on February 1, 2016: member
    • #7438 is a version of #7082 (which indeed still has to be merged)
    • #7387 has no counterpart for master, good catch
  6. laanwj commented at 2:55 pm on February 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?
  7. laanwj commented at 11:50 am on February 2, 2016: member
    Gmaxwell told me on IRC that it wasn’t a problem: also ACK #7438 for master.
  8. laanwj merged this on Feb 2, 2016
  9. laanwj closed this on Feb 2, 2016

  10. laanwj referenced this in commit 3dc3149e63 on Feb 2, 2016
  11. MarcoFalke deleted the branch on Feb 2, 2016
  12. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-03-31 09:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me