[0.12.2] Backports #7938
Merged
[0.12.2] Backports #7938
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b764e26 to
591f557
Compare
Github-Pull: bitcoin#7164 Rebased-From: 39a525c
Github-Pull: bitcoin#7527 Rebased-From: c372572
Github-Pull: bitcoin#7526 Rebased-From: 37767fd
Github-Pull: bitcoin#7189 Rebased-From: 3d19193
It looks like, TorController::disconnected_cb(TorControlConnection& conn) gets called multiple times which results in multiple event_new(). Avoid this by creating the event only once in the constructore, and deleting it only once in the destructor (thanks to Cory Fields for the idea). Replaces the fix by Jonas Schnelli in bitcoin#7610, see discussion there. Github-Pull: bitcoin#7637 Rebased-From: e219503
Github-Pull: bitcoin#7521 Rebased-From: 5a2b1c0
see issues: bitcoin-dot-org/Bitcoin.org#1237 bitcoin#7532 Github-Pull: bitcoin#7541 Rebased-From: 7eef1d0
We do not know that a class of Network is reachable, only that it is not. Github-Pull: bitcoin#7553 Rebased-From: 110b62f
…onnections. Github-Pull: bitcoin#7642 Rebased-From: d84ea1a
curl is required to fetch dependencies Github-Pull: bitcoin#7658 Rebased-From: ce41cf0
Previously we used the CInv that would be sent to the peer announcing the transaction as the key, but using the txid instead allows us to decouple the p2p layer from the application logic (which relies on this map to avoid duplicate tx requests). Github-Pull: bitcoin#7862 Rebased-From: 7e91f63
…/util.cpp`. See bitcoin#7845 (comment). Also refactored `GetDefaultDataDir` function to return path for Mac in one expression. Github-Pull: bitcoin#7850 Rebased-From: 41dbc48
Previously we would assert that if every block in vBlockHashesToAnnounce is in chainActive, then the blocks to be announced must connect. However, there are edge cases where this assumption could be violated (eg using invalidateblock / reconsiderblock), so just check for this case and revert to inv-announcement instead. Github-Pull: bitcoin#7919 Rebased-From: 3a99fb2
cc1d0de to
5978664
Compare
SetString seems to be passing the length of the wrong variable to memory_cleanse, resulting in the last byte of the temporary buffer not being securely erased. Github-Pull: bitcoin#7922 Rebased-From: 5770449
|
utACK c3d1bc3 |
laanwj
added a commit
that referenced
this pull request
Jun 9, 2016
c3d1bc3 CBase58Data::SetString: cleanse the full vector (Kaz Wesley) 43c14ac Fix headers announcements edge case (Suhas Daftuar) 06c73a1 Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp`. (Alexander Regueiro) 7e71785 Use txid as key in mapAlreadyAskedFor (Suhas Daftuar) 5583a3d Add curl to Gitian setup instrustions (BtcDrak) d3ead9b Avoid "Unknown command" messages when receiving getaddr on outbound connections. (R E Broadley) a5bc6a1 Remove vfReachable and modify IsReachable to only use vfLimited. (Patrick Strateman) 52c1011 Clarify description of blockindex (Matthew Zipkin) 21b2f82 Don't resend wallet txs that aren't in our own mempool (Alex Morcos) 66d5408 Fix memleak in TorController [rework] (Wladimir J. van der Laan) 1c3d38b Remove spurious dollar sign. Fixes #7189. (Chris Moore) 64fd0ce fix spelling of advertise in src and doc (jloughry) a9e73f7 Fix and cleanup listreceivedbyX documentation (instagibbs) 9095594 Do not download transactions during inital sync (ptschip)
This was referenced Jun 9, 2016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes the commits which were tagged with "needs backport".