Merge branch 'master' into async-ipv6-rpc
415a87ef3633Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'master' into async-ipv6-rpc

Details

Provenance

Giel van Schijndel <me@mortis.eu>	Authored on Jun 24 2012, 10:34
deadalnix	Pushed on May 14 2017, 22:04

Parents

rABC896899e0d66e: *Always* send a shutdown signal to enable custom shutdown actions
rABC817ee0d82608: Merge pull request #1174 from sipa/torhs

Branches

Unknown

Tags

Unknown

Event Timeline

Giel van Schijndel <me@mortis.eu> committed rABC415a87ef3633: Merge branch 'master' into async-ipv6-rpc (authored by Giel van Schijndel <me@mortis.eu>).Jun 24 2012, 10:34

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

817ee0d82608 Merge pull request #1174 from sipa/torhs
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
0ae2ac5431c7 Merge pull request #1503 from gmaxwell/testnet_tweaks
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
d789a3f1403f Some documentation about tor
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
863e995b79ec Debug version messages
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
54ce3bad64ea Add -tor and related configuration
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
d077dd2a6ed4 Rewrite CNetAddr::GetReachabilityFrom()
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
70f7f0038592 Node support for Tor hidden services
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
d62a1947be53 Merge pull request #1458 from jgarzik/tracenet
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
d07eaba19598 Introduce -debugnet option, thereby quieting some redundant debug messages
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
cb1fcde2f4ea Merge pull request #1502 from jgarzik/getrawmempool
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
e6332751c613 Remove some rule differences which aren't needed with testnet3.
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
25d5c1952282 RPC: add 'getrawmempool', listing all transaction ids in memory pool
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
a3869547e5ea Merge pull request #1495 from Diapolo/fix_CKey_mem_leak
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
e0be8da39240 Unit tests for base32 encode/decode
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
c4c99ade653e Base32 encoding/decoding
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
a08e1826981e Merge pull request #1490 from luke-jr/gd_ljr_key
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
9700f212adfd Merge pull request #1496 from xanatos/patch-2
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
fdfdb5cd7db5 = instead of == in multisig_tests.cpp
Author
xanatos <xanatos@geocities.com>
Browse Repository
No Builds
No Audits
a3d12f445ab1 fix a memory leak in key.cpp
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
0783bcceef7c gitian-downloader: Update luke-jr's key
Author
Luke Dashjr <luke-jr+git@utopios.org>
Browse Repository
No Builds
No Audits
d65e959baeb3 Update my GPG key
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
219abac227e7 Merge pull request #1488 from sipa/noowner
Author
Jeff Garzik <jgarzik@exmulti.com>
Browse Repository
No Builds
No Audits
70f6049f713a Remove CTxDB::ReadOwnerTxes.
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
703db97d80ea Merge pull request #1483 from Diapolo/txtablemodel_updateDisplayUnit
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
229c34f818da GUI: ensure a changed bitcoin unit immediately updates the tx list amounts
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
c283b3c569d6 print large orphan warning BEFORE deleting pvMsg
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
451c3957fe63 Merge pull request #1485 from xanatos/patch-1
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
16d567194305 If (for example) the new max_size must be 5 then at the end the queue.size()…
Author
xanatos <xanatos@geocities.com>
Browse Repository
No Builds
No Audits
4c6b210af0d6 Fix netbase tests
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
c5532e188e17 Merge pull request #1399 from sipa/ipparse
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
7596a030c6c2 Merge branch 'master' of https://github.com/fanquake/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
550c73f4c878 Merge branch 'signbugs' of https://github.com/wizeman/bitcoin
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
baf814f3dae1 OS X not OSX
Author
fanquake <fanquake@gmail.com>
Browse Repository
No Builds
No Audits
8b7b3be76529 Further updates to build instructions
Author
fanquake <fanquake@gmail.com>
Browse Repository
No Builds
No Audits
5204ca87e23f Merge pull request #1480 from fanquake/master
Author
Gavin Andresen <gavinandresen@gmail.com>
Browse Repository
No Builds
No Audits
2bbfcd2d0270 Update OSX build instructions
Author
Fordy <fanquake@gmail.com>
Browse Repository
No Builds
No Audits
432d28d3bb02 Merge pull request #1477 from gmaxwell/master
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
a54d2118be9b Merge pull request #1434 from Diapolo/GUI_fix_displayunit
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
8ce04527f90a Merge pull request #1451 from Diapolo/sendcoins
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
6062de265af3 Merge pull request #1461 from laanwj/2012_06_helpmessage
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
3bbb49de55df Fix inverted logic for !Discover/!UPNP when !Listen.
Author
Gregory Maxwell <greg@xiph.org>
Browse Repository
No Builds
No Audits
e0873dafc579 add the slot updateDisplayUnit() to overviewpage, sendcoinsdialog…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
c4971e24f9bc Add netbase tests
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
1e8aeae15a30 Improve parsing of IPv6 addresses
Author
Pieter Wuille <pieter.wuille@gmail.com>
Browse Repository
No Builds
No Audits
7d72a8c36a87 Show command line options as dialog when opened from debug window
Author
Wladimir J. van der Laan <laanwj@gmail.com>
Browse Repository
No Builds
No Audits
b5782531adfb set cursor for balance field to IBeamCursor (to show the user it IS selectable)…
Author
Philip Kaufmann <phil.kaufmann@t-online.de>
Browse Repository
No Builds
No Audits
31ac53fbdc23 Move NOINLINE definition to test where it's used.
Author
Ricardo M. Correia <rcorreia@wizy.org>
Browse Repository
No Builds
No Audits
43346904e15c Don't overflow integer on 32-bit machines.
Author
Ricardo M. Correia <rcorreia@wizy.org>
Browse Repository
No Builds
No Audits
10b45b4c2e11 Use C++-style numeric limits instead of C-style.
Author
Ricardo M. Correia <rcorreia@wizy.org>
Browse Repository
No Builds
No Audits
78e851f94f67 Fix noinline definition so that it works for more compilers.
Author
Ricardo M. Correia <rcorreia@wizy.org>
Browse Repository
No Builds
No Audits

Changes (37)

Path

Size

contrib/

gitian-downloader/

doc/

src/

qt/

forms/

transactiontablemodel.cpp

transactiontablemodel.h

test/

	base32_tests.cpp
	base64_tests.cpp

rABC415a87ef3633

View Options

contrib/gitian-downloader/luke-jr-key.pgp

View Options

contrib/gitian-downloader/sipa-key.pgp

View Options

doc/Tor.txt

View Options

doc/build-msw.txt

View Options

doc/build-osx.txt

View Options

doc/build-unix.txt

View Options

src/bignum.h

View Options

src/bitcoinrpc.cpp

View Options

src/db.cpp

View Options

src/db.h

View Options

src/init.cpp

View Options

src/key.cpp

View Options

src/main.cpp

View Options

src/main.h

View Options

src/mruset.h

View Options

src/net.cpp

View Options

src/net.h

View Options

src/netbase.cpp

View Options

src/netbase.h

View Options

src/qt/bitcoin.cpp

View Options

src/qt/forms/sendcoinsdialog.ui

View Options

src/qt/guiutil.cpp

View Options

src/qt/guiutil.h

View Options

src/qt/overviewpage.cpp

View Options

src/qt/overviewpage.h

View Options

src/qt/sendcoinsdialog.cpp

View Options

src/qt/sendcoinsdialog.h

View Options

src/qt/sendcoinsentry.cpp

View Options

src/qt/sendcoinsentry.h

View Options

src/qt/transactiontablemodel.cpp

View Options

src/qt/transactiontablemodel.h

View Options

src/test/base32_tests.cpp

View Options

src/test/bignum_tests.cpp

View Options

src/test/multisig_tests.cpp

View Options

src/test/netbase_tests.cpp

View Options

src/util.cpp

View Options

Merge branch 'master' into async-ipv6-rpc415a87ef3633UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (37)

rABC415a87ef3633

contrib/gitian-downloader/luke-jr-key.pgp

contrib/gitian-downloader/sipa-key.pgp

doc/Tor.txt

doc/build-msw.txt

doc/build-osx.txt

doc/build-unix.txt

src/bignum.h

src/bitcoinrpc.cpp

src/db.cpp

src/db.h

src/init.cpp

src/key.cpp

src/main.cpp

src/main.h

src/mruset.h

src/net.cpp

src/net.h

src/netbase.cpp

src/netbase.h

src/qt/bitcoin.cpp

src/qt/forms/sendcoinsdialog.ui

src/qt/guiutil.cpp

src/qt/guiutil.h

src/qt/overviewpage.cpp

src/qt/overviewpage.h

src/qt/sendcoinsdialog.cpp

src/qt/sendcoinsdialog.h

src/qt/sendcoinsentry.cpp

src/qt/sendcoinsentry.h

src/qt/transactiontablemodel.cpp

src/qt/transactiontablemodel.h

src/test/base32_tests.cpp

src/test/bignum_tests.cpp

src/test/multisig_tests.cpp

src/test/netbase_tests.cpp

src/util.cpp

src/util.h

Merge branch 'master' into async-ipv6-rpc
415a87ef3633Unpublished
Actions