DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
6,235 Commits 6 Branches 7 Tags
0f2f2b38d024342dfd9a4758dd5801e73c59f426
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan d3165ed35a Merge pull request #4347 
6c37f7f `getrawchangeaddress` should fail when keypool exhausted (Wladimir J. van der Laan)
 2014-07-11 15:34:27 +02:00
Wladimir J. van der Laan 6c37f7fd78 getrawchangeaddress should fail when keypool exhausted 
An user on IRC reported an issue where `getrawchangeaddress`
keeps returning a single address when the keypool is exhausted.
In my opinion this is strange behaviour.

- Change CReserveKey to fail when running out of keys in the keypool.
- Make `getrawchangeaddress` return RPC_WALLET_KEYPOOL_RAN_OUT when
  unable to create an address.
- Add a Python RPC test for checking the keypool behaviour in combination
  with encrypted wallets.
 2014-07-11 15:24:29 +02:00
Wladimir J. van der Laan 6ad2c2402e Merge pull request #4507 
b60be6b Clean up RPCs that are disabled in safe-mode. (Gregory Maxwell)
 2014-07-11 15:16:33 +02:00
Wladimir J. van der Laan f0fc81a083 Merge pull request #4501 
954d2e7 Avoid a segfault on getblock if it can't read a block from disk. (Ruben Dario Ponticelli)
 2014-07-11 05:02:15 +02:00
Wladimir J. van der Laan f2286a69a9 Merge pull request #4190 
502972f Fix Error: No file at @loader_path/libboost_system-mt.dylib (Federico Bond)
 2014-07-10 08:04:59 +02:00
Wladimir J. van der Laan e28c1ae75d Merge pull request #4428 
00d1980 init.cpp: log fee estimates filename on error (Philip Kaufmann)
 2014-07-09 16:50:58 +02:00
Wladimir J. van der Laan 4856f4c396 Merge pull request #4486 
45abeb2 Update Debian packaging description for new bitcoin-cli (Johnathan Corgan)
 2014-07-09 16:45:23 +02:00
Wladimir J. van der Laan 52a7d52ffb Merge pull request #4340 
33cc907 Add DNS seed of open-nodes.org (kevin)
 2014-07-09 12:00:16 +02:00
Wladimir J. van der Laan 2ee918d121 Merge pull request #4275 
509f926 Payment request parsing on startup now only changes network if a valid network name is specified. (Ross Nicoll)
 2014-07-09 08:47:16 +02:00
Wladimir J. van der Laan f51816f425 Merge pull request #4490 
575e70c build: fix win32 static linking after libtool merge (Cory Fields)
9a427da build: re-add AM_LDFLAGS where it's overridden (Cory Fields)
 2014-07-09 08:45:17 +02:00
Wladimir J. van der Laan 418d4ad110 Merge pull request #4479 
109849e Bugfix: strerror_r can return an error, and if it does, POSIX does not specify the content of the buffer (Luke Dashjr)
 2014-07-08 13:35:56 +02:00
Wladimir J. van der Laan 7d05645693 Merge pull request #4465 
d88af56 Fee fixes (Cozz Lovan)
 2014-07-08 09:22:24 +02:00
Wladimir J. van der Laan 1fedd65fcf Merge pull request #4480 
2227725 test/bloom_tests: Use UL suffix for unsigned long number to ensure compatibility (Luke Dashjr)
 2014-07-07 18:24:04 +02:00
Wladimir J. van der Laan c6ac5fcfc2 Merge pull request #4471 
40f5cb8 Send rejects and apply DoS scoring for errors in direct block validation. (Pieter Wuille)
 2014-07-07 17:31:05 +02:00
Wladimir J. van der Laan f748ff730b Merge pull request #4045 
a3e192a replaced MINE_ with ISMINE_ (JaSK)
53a2148 fixed bug where validateaddress doesn't display information (JaSK)
f28707a fixed bug in ListReceived() (JaSK)
519dd1c Added MINE_ALL = (spendable|watchonly) (JaSK)
23b0506 Fixed some stuff in TransactionDesc (JaSK)
80dda36 removed default argument values for ismine filter (JaSK)
d5087d1 Use script matching rather than destination matching for watch-only. (Pieter Wuille)
0fa2f88 added includedWatchonly argument to listreceivedbyaddress/...account (JaSK)
f87ba3d added includeWatchonly argument to 'gettransaction' because it affects balance calculation (JaSK)
a5c6c5d fixed tiny glitch and improved readability like laanwj suggested (JaSK)
d7d5d23 Added argument to listtransactions and listsinceblock to include watchonly addresses (JaSK)
952877e Showing 'involvesWatchonly' property for transactions returned by 'listtransactions' and 'listsinceblock'. It is only appended when the transaction involves a watchonly address. (JaSK)
83f3543 Added argument to listaccounts to include watchonly addresses (JaSK)
d4640d7 Added argument to getbalance to include watchonly addresses and fixed errors in balance calculation. (JaSK)
d2692f6 Watchonly transactions are marked in transaction history (JaSK)
ffd40da Watchonly balances are shown separately in gui. (JaSK)
2935b21 qt: Hide unspendable outputs in coin control (Wladimir J. van der Laan)
c898846 Add support for watch-only addresses (Pieter Wuille)
 2014-07-07 16:06:28 +02:00
Wladimir J. van der Laan afe380ef0f Fix the build for windows 
Problem introduced in caf6150. Thanks to @drak for noticing. Fixes #4473.
 2014-07-07 12:48:56 +02:00
Wladimir J. van der Laan 4252f2928b Merge pull request #4327 
a339a37 error out, when we detect -socks argument (Philip Kaufmann)
0127a9b remove SOCKS4 support from core and GUI (Philip Kaufmann)
 2014-07-07 12:45:28 +02:00
Wladimir J. van der Laan 0aa1d106e8 Merge pull request #4477 
18c7ba8 Add translation mailing list to README.md (Michael Ford)
 2014-07-07 10:43:18 +02:00
Wladimir J. van der Laan 88ae36bc06 Merge pull request #4466 
ad87bc4 [Qt] Replace status bar unit icon with actual images (Cozz Lovan)
 2014-07-07 10:42:53 +02:00
Wladimir J. van der Laan 1132cdbff3 Merge pull request #4401 
cf04d83 add OpenSSL RAND_cleanup() on OpenSSL shutdown (Philip Kaufmann)
 2014-07-07 10:35:26 +02:00
Wladimir J. van der Laan 642c8e75bc Merge pull request #4399 
674c070 [Qt] seed OpenSSL PNRG with Windows event data (Philip Kaufmann)
 2014-07-07 10:31:33 +02:00
Wladimir J. van der Laan ebb37a417a Merge pull request #4373 
2ec5a3d rpc: Prevent easy memory exhaustion attack (Wladimir J. van der Laan)
 2014-07-07 10:30:06 +02:00
Wladimir J. van der Laan 4851d09603 Merge pull request #4446 
209377a Use GetBlockTime() more (jtimon)
 2014-07-07 10:29:10 +02:00
Wladimir J. van der Laan 5e1b7a23b0 Merge pull request #4470 
f4b00be Add CChain::GetLocator() unit test (Pieter Wuille)
3c85d2e Fix CChain::GetLocator (Pieter Wuille)
 2014-07-07 10:28:09 +02:00
Wladimir J. van der Laan bc06e8f402 Merge pull request #4463 
e832ab7 Rename SendMoneyToDestination to SendMoney. (Daniel Kraft)
 2014-07-07 10:22:58 +02:00
Wladimir J. van der Laan 6654a87e7b Merge pull request #4462 
3d0e92d [Qt] remove dup includes in bitcoingui (Philip Kaufmann)
 2014-07-07 10:16:31 +02:00
Wladimir J. van der Laan 4ea8f632fe Merge pull request #4467 
1f740dd Remove unused variable (R E Broadley)
 2014-07-07 10:14:10 +02:00
Wladimir J. van der Laan 6fa1f794f7 Merge pull request #4459 
73ac7ab Move ui_interface to bitcoin_server.a (Wladimir J. van der Laan)
5090303 qt: Pick translation messages only from necessary files (Wladimir J. van der Laan)
 2014-07-07 10:01:56 +02:00
Wladimir J. van der Laan 73ac7abd08 Move ui_interface to bitcoin_server.a 
There is no need for it in the utility libraries or tools.
Put it in init.cpp, and in the tests separately (as they can't link init).
 2014-07-07 09:58:56 +02:00
Wladimir J. van der Laan 509030344c qt: Pick translation messages only from necessary files 
Utility libraries (common, util) as well as extra tools shouldn't be
parsed for translation messages, only the server and wallet part qualify
here.
 2014-07-07 09:57:37 +02:00
Wladimir J. van der Laan 4ed2315e86 Merge pull request #4457 
834e46e CBlockIndex()::SetNull() method to avoid code repetition (jtimon)
 2014-07-07 07:44:48 +02:00
Wladimir J. van der Laan e1f7c7d173 Merge pull request #4472 
9f4da19 Use pong receive time rather than processing time (Pieter Wuille)
 2014-07-07 06:28:43 +02:00
Wladimir J. van der Laan 2ec5a3d212 rpc: Prevent easy memory exhaustion attack 
Allocate memory for POST message data only as bytes come in, instead of
all at once at the beginning.

Fixes #4343.
 2014-07-04 09:20:39 +02:00
Wladimir J. van der Laan e81e2e8f7c Merge pull request #4421 
caf6150 Use async name resolving to improve net thread responsiveness (Huang Le)
 2014-07-04 08:40:01 +02:00
Wladimir J. van der Laan 81efcd76e6 Add libtool generated files to .gitignore 2014-07-04 08:15:59 +02:00
Wladimir J. van der Laan 00fa78c35b Merge pull request #3764 
2e36866 Show nodeid instead of addresses (for anonymity) unless otherwise requested. (R E Broadley)
 2014-07-04 08:04:30 +02:00
Wladimir J. van der Laan e61c6d69ad Merge pull request #4450 
0da6b3f Remove signal DoubleSpendDetected, use function (Tom Harding)
88dd359 Check signatures before respend relay (Tom Harding)
 2014-07-04 05:50:53 +02:00
Wladimir J. van der Laan 07b6c2b901 Merge pull request #4302 
8969828 [Qt] New status bar Unit Display Control and related changes. (gubatron)
 2014-07-03 17:47:58 +02:00
Wladimir J. van der Laan 29264a0a60 Merge pull request #4455 
3f7a61f Update Gitian Build guide to include OSX (Michael Ford)
 2014-07-03 08:48:31 +02:00
Wladimir J. van der Laan a793fcabed Merge pull request #4454 
9d5ad71 Fix formatting in release-process.md (Michael Ford)
 2014-07-03 08:14:13 +02:00
Wladimir J. van der Laan 4278b1df45 Clarify error message when invalid -rpcallowip 
Also add to HelpMessage() what specifications are valid.
 2014-07-03 07:11:59 +02:00
Wladimir J. van der Laan 2935b21103 qt: Hide unspendable outputs in coin control 2014-07-02 15:48:38 +02:00
Wladimir J. van der Laan c9600ce640 Merge pull request #4312 
fda3fed libsecp256k1 integration (Pieter Wuille)
5566826 secp256k1: Add build-side changes for libsecp256k1 (Cory Fields)
b150b09 secp256k1: add libtool as a dependency (Cory Fields)
 2014-07-02 09:23:05 +02:00
Wladimir J. van der Laan e442c82faa Merge pull request #4449 
462ad22 Clean up release-process.md after OS X gitian changes (Micha)
 2014-07-02 09:09:47 +02:00
Wladimir J. van der Laan 2882d594fe Fix the Qt5 build after d95ba75 
Sorry, my own fault this time.
 2014-07-02 08:15:09 +02:00
Wladimir J. van der Laan 33fdd99288 qt: Change serious messages from qDebug to qWarning 
By changing the logging stream for warnings from qDebug to qWarning,
these will always be logged to debug.log.
 2014-07-01 15:21:17 +02:00
Wladimir J. van der Laan d95ba75825 qt: Log messages with type>QtDebugMsg as non-debug 
More important messages should end up in the log no matter
if -debug=qt is set.
 2014-07-01 14:58:02 +02:00
Wladimir J. van der Laan b29b509612 Merge pull request #4325 
4aaa017 rework help messages for fee-related options (Philip Kaufmann)
 2014-07-01 12:55:33 +02:00
Wladimir J. van der Laan bcade18bb0 Merge pull request #4447 
9a6497e http to https, 2013 to 2014 (Trevin Hofmann)
 2014-07-01 12:50:53 +02:00
Wladimir J. van der Laan dd638dd712 typedef std::map<uint256, CCoins> to CCoinsMap 
This makes it possible to switch to a more efficient map type
without changing all occurences manually.

Merges half of #4413.
 2014-07-01 12:48:16 +02:00
Wladimir J. van der Laan 9aaa1cadf4 Merge pull request #4397 
5d59921 add missing BOOST_FOREACH indentation in ThreadSocketHandler() (Philip Kaufmann)
9e9ca2b small cleanup of #ifdefs in BindListenPort() (Philip Kaufmann)
 2014-07-01 09:54:41 +02:00
Wladimir J. van der Laan 3faf1f8294 test: Fix warning about integer signedness in P2SH tests 2014-06-30 16:37:59 +02:00
Wladimir J. van der Laan 5c184cb850 Merge pull request #4415 
e35b37b RPC client: Simplify command line string-to-JSON-value conversion code (Jeff Garzik)
 2014-06-30 15:56:01 +02:00
Wladimir J. van der Laan 77888d68d5 Fix the build for Qt5 
Merging #3883 broke the Qt5 build, define the color in the standard
way.
 2014-06-30 15:44:55 +02:00
Wladimir J. van der Laan ac26571d2b Merge pull request #4437 
de79aaa Move non-trivial uint256.h methods to uint256.cpp (Pieter Wuille)
 2014-06-30 11:27:46 +02:00
Wladimir J. van der Laan eba8c44fdd Merge pull request #4440 
16f33f1 fix RPC error replies (kazcw)
 2014-06-30 11:25:37 +02:00
Wladimir J. van der Laan a11f648585 Merge pull request #4441 
ffebc1b Update verify.sh script to point to bitcoin.org (Michael Ford)
 2014-06-29 08:49:26 +02:00
Wladimir J. van der Laan 7b8fc9d8ad Merge pull request #4436 
675bcd5 Correct comment for 15-of-15 p2sh script size (Michael Ford)
 2014-06-28 15:09:15 +02:00
Wladimir J. van der Laan c8b6c0a2cf Merge pull request #4425 
6ecf3ed Display unknown commands received. (R E Broadley)
 2014-06-28 15:07:51 +02:00
Wladimir J. van der Laan 9125ef9421 Merge pull request #4398 
86fe1b8 update coding.md to reflect changes by pull (Philip Kaufmann)
e10dcf2 ensure clean and consistent "namespace" usage (Philip Kaufmann)
 2014-06-28 15:06:18 +02:00
Wladimir J. van der Laan 5bc77b2bb2 Merge pull request #4418 
d618965 Add note about PPA to build instructions (Drak)
e5f0247 Simplify build instructions (Drak)
 2014-06-28 15:04:25 +02:00
Wladimir J. van der Laan f62784f961 Merge pull request #4422 
645d497 Replace HexBits with strprintf (jtimon)
 2014-06-28 15:02:03 +02:00
Wladimir J. van der Laan 55b27206d0 Merge pull request #4435 
92ddf2c Update OS X build instructions (Michael Ford)
 2014-06-28 15:00:00 +02:00
Wladimir J. van der Laan ba81f45607 Merge pull request #3990 
0dd5d3a Show only one zero instead of many when getblocks request received with a hashStop of uint256(0) (R E Broadley)
 2014-06-28 10:16:09 +02:00
Wladimir J. van der Laan de9ca93467 Merge pull request #4434 
3f1ea91 doc: Add historical release notes for 0.9.2 (Michael Ford)
 2014-06-28 08:58:14 +02:00
Wladimir J. van der Laan dfaa35d8cd Merge pull request #4430 
33c62c9 set shutdown title to main window title (Philip Kaufmann)
 2014-06-27 18:53:11 +02:00
Wladimir J. van der Laan 4684c883bb Merge pull request #4208 
6a5c124 [Qt] don't allow translation of our example btc address (Philip Kaufmann)
 2014-06-27 12:46:49 +02:00
Wladimir J. van der Laan 3a9d796eb9 Merge pull request #4426 
40a158e minor code format fix in rpc-related files (Philip Kaufmann)
 2014-06-27 12:35:57 +02:00
Wladimir J. van der Laan 49d86c7477 rpc-tests: Fix rpcbind_test after 0193fb8 
Port number for RPC is no longer static as multiple tests could be
running at once.
 2014-06-27 10:06:40 +02:00
Wladimir J. van der Laan d77f761be9 Merge pull request #4288 
ed5769f Move AcceptedConnection class to rpcserver.h. (Jeff Garzik)
854d013 RPC code movement: separate out JSON-RPC execution logic from HTTP server logic (Jeff Garzik)
c912e22 RPC cleanup: Improve HTTP server replies (Jeff Garzik)
 2014-06-27 10:03:19 +02:00
Wladimir J. van der Laan 19168c3377 Merge pull request #4424 
c598f2a Fixed captitalization in bitcoin-cli-res.rc (Whit J)
 2014-06-27 09:34:46 +02:00
Wladimir J. van der Laan 236ae8665e Merge pull request #3715 
e44fea5 Add an option to allow users to disable relaying/mining data carrier transactions (Luke Dashjr)
 2014-06-26 17:31:12 +02:00
Wladimir J. van der Laan eacff4a9c6 Merge pull request #4392 
8ae973c Allocate more space if necessary in RandSeedAddPerfMon (Wladimir J. van der Laan)
be873f6 Issue warning if collecting RandSeed data failed (Wladimir J. van der Laan)
fcb0a1b change "char pch[200000]" to "new char[200000]" (daniel)
 2014-06-26 17:11:53 +02:00
Wladimir J. van der Laan ffb32acfab Merge pull request #1583 
2a72d45 JSON-RPC method: prioritisetransaction <txid> <priority delta> <priority tx fee> (Luke Dashjr)
 2014-06-26 16:20:01 +02:00
Wladimir J. van der Laan f40d193c18 Merge pull request #4414 
a90689f Remove timing-based signature cache unit test (Gavin Andresen)
 2014-06-26 15:18:23 +02:00
Wladimir J. van der Laan 8ae973c00c Allocate more space if necessary in RandSeedAddPerfMon 
Currently we use a fixed buffer of 250000 bytes to request
HKEY_PERFORMANCE_DATA. In many cases this is not enough, causing the
entropy collection to be skipped.

Use a loop that grows the buffer as specified in the RegQueryValueEx
documentation:
http://msdn.microsoft.com/en-us/library/windows/desktop/ms724911%28v=vs.85%29.aspx

(as the size of the performance data can differ for every call, the
normal solution of requesting the size then allocating that can't work)
 2014-06-26 15:15:17 +02:00
Wladimir J. van der Laan 343feecf56 Merge pull request #4368 
75c82d4 Move coins.cpp and keystore.cpp to libbitcoin_common (Wladimir J. van der Laan)
84ce18c Remove unnecessary dependencies for bitcoin-cli (Wladimir J. van der Laan)
14f888c Move network-time related functions to timedata.cpp/h (Wladimir J. van der Laan)
 2014-06-25 17:00:09 +02:00
Wladimir J. van der Laan 75c82d4923 Move coins.cpp and keystore.cpp to libbitcoin_common 
Prepare for introduction of `bitcoin-tx` tool.
 2014-06-25 10:31:35 +02:00
Wladimir J. van der Laan 84ce18ca93 Remove unnecessary dependencies for bitcoin-cli 
This commit removes all the unnecessary dependencies (key, core,
netbase, sync, ...) from bitcoin-cli.

To do this it shards the chain parameters into BaseParams, which
contains just the RPC port and data directory (as used by utils and
bitcoin-cli) and Params, with the rest.
 2014-06-25 10:31:35 +02:00
Wladimir J. van der Laan 14f888ca80 Move network-time related functions to timedata.cpp/h 
The network time-offset-mangement functions from util.cpp are moved to
timedata.(cpp|h). This breaks the dependency of util on netbase.
 2014-06-25 09:24:50 +02:00
Wladimir J. van der Laan 208bf5b9e0 Merge pull request #3839 
fd704c7 move pow constants to chainparams (jtimon)
df852d2 Refactor proof of work related functions out of main (jtimon)
 2014-06-25 09:14:36 +02:00
Wladimir J. van der Laan 27383b9015 Merge pull request #4390 
6dc90ed replace 3 separate calls to WSAGetLastError() with 1 (Philip Kaufmann)
 2014-06-25 07:20:42 +02:00
Wladimir J. van der Laan e6cb20e19a Merge pull request #4404 
e9f2460 Add dependencies for Mac OSX gitian builds (Drak)
 2014-06-25 07:13:28 +02:00
Wladimir J. van der Laan ea37a208de Merge pull request #4406 
b79f59b Update .gitignore (Drak)
 2014-06-25 07:07:27 +02:00
Wladimir J. van der Laan fcbb1a74db Merge pull request #4408 
e3aedba Consistent lettering (Whit J)
 2014-06-25 07:07:04 +02:00
Wladimir J. van der Laan 6e8472ec7c Merge pull request #4403 
5fbb4c9 [Qt] fix links in about window not opening (Philip Kaufmann)
 2014-06-24 18:07:45 +02:00
Wladimir J. van der Laan 0410d11b3a Merge pull request #4130 
1c750db remove -tor compatibility code (only allow -onion) (Philip Kaufmann)
 2014-06-24 17:51:32 +02:00
Wladimir J. van der Laan 5dd0bfefcb Merge pull request #4169 
0655fac miner: indentation fixes, remove for (;;) (Philip Kaufmann)
 2014-06-24 17:17:13 +02:00
Wladimir J. van der Laan d4392c8989 Merge pull request #3674 
77cbd46 Let -zapwallettxes recover transaction meta data (Cozz Lovan)
 2014-06-24 17:04:52 +02:00
Wladimir J. van der Laan 36db6633c3 Merge pull request #4395 
f3967bc build: fix build weirdness after 54372482. (Cory Fields)
 2014-06-23 20:26:12 +02:00
Wladimir J. van der Laan 3b1295e988 qa/rpc_tests: Wait for handshake to complete in connect_nodes 
This avoids a race condition in which the connection was
made but the version handshake is not completed yet. In that
case transactions won't be broadcasted to a peer yet, and
the nodes will wait forever for their mempools to sync.
 2014-06-23 17:43:55 +02:00
Wladimir J. van der Laan 0869df195c Merge pull request #3960 
3f9a019 added list/get received by address/ account tests (Alon Muroch)
 2014-06-23 17:37:40 +02:00
Wladimir J. van der Laan be873f6454 Issue warning if collecting RandSeed data failed 2014-06-23 16:29:51 +02:00
Wladimir J. van der Laan a652787737 Merge pull request #4314 
b3c912d [Qt] Change Coin control labels and tooltips because of non-rounding fees (Cozz Lovan)
 2014-06-23 12:07:50 +02:00
Wladimir J. van der Laan 17db9767c4 doc: Remove unused section from release-process.md 
It is outdated information. If we ever resurrect gitian-downloader it
can be brought back from history and updated.
 2014-06-23 12:04:33 +02:00
Wladimir J. van der Laan 5459116d61 Merge pull request #4293 
fa126ef Avoid undefined behavior using CFlatData in CScript serialization (Wladimir J. van der Laan)
 2014-06-23 10:44:57 +02:00
Wladimir J. van der Laan fa126effc2 Avoid undefined behavior using CFlatData in CScript serialization 
`&vch[vch.size()]` and even `&vch[0]` on vectors can cause assertion
errors with VC in debug mode. This is the problem mentioned in #4239.
The deeper problem with this is that we rely on undefined behavior.

- Add `begin_ptr` and `end_ptr` functions that get the beginning and end
  pointer of vector in a reliable way that copes with empty vectors and
  doesn't reference outside the vector
(see https://stackoverflow.com/questions/1339470/how-to-get-the-address-of-the-stdvector-buffer-start-most-elegantly/1339767#1339767).
- Add a convenience constructor to CFlatData that wraps a vector.

I added `begin_ptr` and `end_ptr` as separate functions as I imagine
they will be useful in more places.
 2014-06-23 10:38:15 +02:00
Wladimir J. van der Laan 52d4abfdef Merge pull request #4388 
3dc1464 add missing vhListenSocket.clear(); to CNetCleanup() (Philip Kaufmann)
2831a03 remove unused CNode::Cleanup() (Philip Kaufmann)
 2014-06-23 10:21:38 +02:00
Wladimir J. van der Laan bfb55dd586 Merge pull request #4385 
040c2d3 Fix formatting (Drak)
 2014-06-23 10:21:20 +02:00
Wladimir J. van der Laan 82f2bba1ad Merge pull request #4391 
b612bde remove unneded class CNodeCombinedStats; from rpcconsole.cpp (Philip Kaufmann)
 2014-06-23 10:01:07 +02:00