highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-02-04 06:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.5.x' into 0.6.0.x

Browse Source 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
This commit is contained in:
Luke Dashjr
2012-08-12 17:16:40 +00:00
parent 89c5c381b7 982f4fd301
commit cafa8f2879
26 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/netbase.cpp
View File

@@ -427,7 +427,7 @@ bool CNetAddr::IsMulticast() const
bool CNetAddr::IsValid() const
{
// Clean up 3-byte shifted addresses caused by garbage in size field
// Cleanup 3-byte shifted addresses caused by garbage in size field
// of addr messages from versions before 0.2.9 checksum.
// Two consecutive addr messages look like this:
// header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26...