+ merge fixes + keepass on evhttp
As suggested by Greg Maxwell-- unit test to make sure a block with a double-spend in it doesn't pass validation if half of the double-spend is already in the memory pool (so full-blown transaction validation is skipped) when the block is received.
- Changed out logos (just a placeholder) - DRK -> DASH - ./darkcoin -> ./dash
Syntax Highlighting