aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/README.md4
-rw-r--r--contrib/debian/control2
-rw-r--r--contrib/debian/copyright5
-rw-r--r--contrib/debian/manpages/bitcoin-cli.128
-rw-r--r--contrib/debian/manpages/bitcoin-qt.1186
-rw-r--r--contrib/debian/manpages/bitcoin.conf.566
-rw-r--r--contrib/debian/manpages/bitcoind.1177
-rw-r--r--contrib/devtools/README.md83
-rwxr-xr-xcontrib/devtools/check-doc.py45
-rwxr-xr-xcontrib/devtools/clang-format-diff.py164
-rwxr-xr-xcontrib/devtools/fix-copyright-headers.py69
-rwxr-xr-xcontrib/devtools/github-merge.py235
-rwxr-xr-xcontrib/devtools/github-merge.sh185
-rwxr-xr-xcontrib/devtools/security-check.py4
-rwxr-xr-xcontrib/devtools/symbol-check.py5
-rwxr-xr-xcontrib/devtools/update-translations.py22
-rw-r--r--contrib/gitian-descriptors/README.md13
-rw-r--r--contrib/gitian-descriptors/gitian-linux.yml8
-rw-r--r--contrib/gitian-descriptors/gitian-osx-signer.yml3
-rw-r--r--contrib/gitian-descriptors/gitian-osx.yml6
-rw-r--r--contrib/gitian-descriptors/gitian-win-signer.yml2
-rw-r--r--contrib/gitian-descriptors/gitian-win.yml7
-rw-r--r--contrib/gitian-downloader/achow101-key.pgp52
-rw-r--r--contrib/gitian-downloader/linux-download-config45
-rw-r--r--contrib/gitian-downloader/win32-download-config45
-rw-r--r--contrib/seeds/README.md7
-rwxr-xr-xcontrib/seeds/generate-seeds.py2
-rw-r--r--contrib/seeds/nodes_main.txt1436
28 files changed, 1400 insertions, 1506 deletions
diff --git a/contrib/README.md b/contrib/README.md
index 125594312b..b6e572102a 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -11,10 +11,10 @@ Repository Tools
### [Developer tools](/contrib/devtools) ###
Specific tools for developers working on this repository.
-Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG.
+Contains the script `github-merge.py` for merging github pull requests securely and signing them using GPG.
### [Verify-Commits](/contrib/verify-commits) ###
-Tool to verify that every merge commit was signed by a developer using the above `github-merge.sh` script.
+Tool to verify that every merge commit was signed by a developer using the above `github-merge.py` script.
### [Linearize](/contrib/linearize) ###
Construct a linear, no-fork, best version of the blockchain.
diff --git a/contrib/debian/control b/contrib/debian/control
index 490b2571c3..fce6bc0118 100644
--- a/contrib/debian/control
+++ b/contrib/debian/control
@@ -23,7 +23,7 @@ Build-Depends: debhelper,
libprotobuf-dev, protobuf-compiler,
python
Standards-Version: 3.9.2
-Homepage: https://www.bitcoin.org/
+Homepage: https://bitcoincore.org/
Vcs-Git: git://github.com/bitcoin/bitcoin.git
Vcs-Browser: https://github.com/bitcoin/bitcoin
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
index 83ce560a79..c039a7bae5 100644
--- a/contrib/debian/copyright
+++ b/contrib/debian/copyright
@@ -5,7 +5,7 @@ Upstream-Contact: Satoshi Nakamoto <satoshin@gmx.com>
Source: https://github.com/bitcoin/bitcoin
Files: *
-Copyright: 2009-2015, Bitcoin Core Developers
+Copyright: 2009-2016, Bitcoin Core Developers
License: Expat
Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
as well as the numerous contributors to the project.
@@ -21,6 +21,7 @@ License: GPL-3+
Files: src/qt/res/icons/add.png
src/qt/res/icons/address-book.png
+ src/qt/res/icons/chevron.png
src/qt/res/icons/configure.png
src/qt/res/icons/debugwindow.png
src/qt/res/icons/edit.png
@@ -56,6 +57,8 @@ Comment: Inspired by Stephan Hutchings Typicons
Files: src/qt/res/icons/tx_mined.png
src/qt/res/src/mine.svg
+ src/qt/res/icons/fontbigger.png
+ src/qt/res/icons/fontsmaller.png
Copyright: Jonas Schnelli
License: Expat
Comment:
diff --git a/contrib/debian/manpages/bitcoin-cli.1 b/contrib/debian/manpages/bitcoin-cli.1
index 154b458739..16c338dd3e 100644
--- a/contrib/debian/manpages/bitcoin-cli.1
+++ b/contrib/debian/manpages/bitcoin-cli.1
@@ -1,4 +1,4 @@
-.TH BITCOIN-CLI "1" "February 2015" "bitcoin-cli 0.10"
+.TH BITCOIN-CLI "1" "February 2016" "bitcoin-cli 0.12"
.SH NAME
bitcoin-cli \- a remote procedure call client for Bitcoin Core.
.SH SYNOPSIS
@@ -11,31 +11,7 @@ This manual page documents the bitcoin-cli program. bitcoin-cli is an RPC client
.SH OPTIONS
.TP
\fB\-?\fR
-Show the help message.
-.TP
-\fB\-conf=\fR<file>
-Specify configuration file (default: bitcoin.conf).
-.TP
-\fB\-datadir=\fR<dir>
-Specify data directory.
-.TP
-\fB\-testnet\fR
-Connect to a Bitcoin Core instance running in testnet mode.
-.TP
-\fB\-regtest\fR
-Connect to a Bitcoin Core instance running in regtest mode (see documentation for -regtest on bitcoind).
-.TP
-\fB\-rpcuser=\fR<user>
-Username for JSON\-RPC connections.
-.TP
-\fB\-rpcpassword=\fR<pw>
-Password for JSON\-RPC connections.
-.TP
-\fB\-rpcport=\fR<port>
-Listen for JSON\-RPC connections on <port> (default: 8332 or testnet: 18332).
-.TP
-\fB\-rpcconnect=\fR<ip>
-Send commands to node running on <ip> (default: 127.0.0.1).
+Show possible options.
.SH "SEE ALSO"
\fBbitcoind\fP, \fBbitcoin.conf\fP
diff --git a/contrib/debian/manpages/bitcoin-qt.1 b/contrib/debian/manpages/bitcoin-qt.1
index 05eadc94cd..685a282080 100644
--- a/contrib/debian/manpages/bitcoin-qt.1
+++ b/contrib/debian/manpages/bitcoin-qt.1
@@ -1,4 +1,4 @@
-.TH BITCOIN-QT "1" "April 2013" "bitcoin-qt 1"
+.TH BITCOIN-QT "1" "February 2016" "bitcoin-qt 0.12"
.SH NAME
bitcoin-qt \- peer-to-peer network based digital currency
.SH DESCRIPTION
@@ -8,184 +8,6 @@ bitcoin\-qt [command\-line options]
.SH OPTIONS
.TP
\-?
-This help message
-.TP
-\fB\-conf=\fR<file>
-Specify configuration file (default: bitcoin.conf)
-.TP
-\fB\-pid=\fR<file>
-Specify pid file (default: bitcoind.pid)
-.TP
-\fB\-gen\fR
-Generate coins
-.TP
-\fB\-gen\fR=\fI0\fR
-Don't generate coins
-.TP
-\fB\-datadir=\fR<dir>
-Specify data directory
-.TP
-\fB\-dbcache=\fR<n>
-Set database cache size in megabytes (default: 25)
-.TP
-\fB\-timeout=\fR<n>
-Specify connection timeout in milliseconds (default: 5000)
-.TP
-\fB\-proxy=\fR<ip:port>
-Connect through SOCKS5 proxy
-.TP
-\fB\-tor=\fR<ip:port>
-Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)
-.TP
-\fB\-dns\fR
-Allow DNS lookups for \fB\-addnode\fR, \fB\-seednode\fR and \fB\-connect\fR
-.TP
-\fB\-port=\fR<port>
-Listen for connections on <port> (default: 8333 or testnet: 18333)
-.TP
-\fB\-maxconnections=\fR<n>
-Maintain at most <n> connections to peers (default: 125)
-.TP
-\fB\-addnode=\fR<ip>
-Add a node to connect to and attempt to keep the connection open
-.TP
-\fB\-connect=\fR<ip>
-Connect only to the specified node(s)
-.TP
-\fB\-seednode=\fR<ip>
-Connect to a node to retrieve peer addresses, and disconnect
-.TP
-\fB\-externalip=\fR<ip>
-Specify your own public address
-.TP
-\fB\-onlynet=\fR<net>
-Only connect to nodes in network <net> (IPv4, IPv6 or Tor)
-.TP
-\fB\-discover\fR
-Discover own IP address (default: 1 when listening and no \fB\-externalip\fR)
-.TP
-\fB\-checkpoints\fR
-Only accept block chain matching built\-in checkpoints (default: 1)
-.TP
-\fB\-listen\fR
-Accept connections from outside (default: 1 if no \fB\-proxy\fR or \fB\-connect\fR)
-.TP
-\fB\-bind=\fR<addr>
-Bind to given address and always listen on it. Use [host]:port notation for IPv6
-.TP
-\fB\-dnsseed\fR
-Find peers using DNS lookup (default: 1 unless \fB\-connect\fR)
-.TP
-\fB\-banscore=\fR<n>
-Threshold for disconnecting misbehaving peers (default: 100)
-.TP
-\fB\-bantime=\fR<n>
-Number of seconds to keep misbehaving peers from reconnecting (default: 86400)
-.TP
-\fB\-maxreceivebuffer=\fR<n>
-Maximum per\-connection receive buffer, <n>*1000 bytes (default: 5000)
-.TP
-\fB\-maxsendbuffer=\fR<n>
-Maximum per\-connection send buffer, <n>*1000 bytes (default: 1000)
-.TP
-\fB\-upnp\fR
-Use UPnP to map the listening port (default: 1 when listening)
-.TP
-\fB\-paytxfee=\fR<amt>
-Fee per KB to add to transactions you send
-.TP
-\fB\-server\fR
-Accept command line and JSON\-RPC commands
-.TP
-\fB\-testnet\fR
-Use the test network
-.TP
-\fB\-debug\fR
-Output extra debugging information. Implies all other \fB\-debug\fR* options
-.TP
-\fB\-debugnet\fR
-Output extra network debugging information
-.TP
-\fB\-logtimestamps\fR
-Prepend debug output with timestamp
-.TP
-\fB\-shrinkdebugfile\fR
-Shrink debug.log file on client startup (default: 1 when no \fB\-debug\fR)
-.TP
-\fB\-printtoconsole\fR
-Send trace/debug info to console instead of debug.log file
-.TP
-\fB\-rpcuser=\fR<user>
-Username for JSON\-RPC connections
-.TP
-\fB\-rpcpassword=\fR<pw>
-Password for JSON\-RPC connections
-.TP
-\fB\-rpcport=\fR<port>
-Listen for JSON\-RPC connections on <port> (default: 8332 or testnet: 18332)
-.TP
-\fB\-rpcallowip=\fR<ip>
-Allow JSON\-RPC connections from specified IP address
-.TP
-\fB\-rpcthreads=\fR<n>
-Set the number of threads to service RPC calls (default: 4)
-.TP
-\fB\-blocknotify=\fR<cmd>
-Execute command when the best block changes (%s in cmd is replaced by block hash)
-.TP
-\fB\-walletnotify=\fR<cmd>
-Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)
-.TP
-\fB\-alertnotify=\fR<cmd>
-Execute command when a relevant alert is received (%s in cmd is replaced by message)
-.TP
-\fB\-upgradewallet\fR
-Upgrade wallet to latest format
-.TP
-\fB\-keypool=\fR<n>
-Set key pool size to <n> (default: 100)
-.TP
-\fB\-rescan\fR
-Rescan the block chain for missing wallet transactions
-.TP
-\fB\-salvagewallet\fR
-Attempt to recover private keys from a corrupt wallet.dat
-.TP
-\fB\-checkblocks=\fR<n>
-How many blocks to check at startup (default: 288, 0 = all)
-.TP
-\fB\-checklevel=\fR<n>
-How thorough the block verification is (0\-4, default: 3)
-.TP
-\fB\-txindex\fR
-Maintain a full transaction index (default: 0)
-.TP
-\fB\-loadblock=\fR<file>
-Imports blocks from external blk000??.dat file
-.TP
-\fB\-reindex\fR
-Rebuild block chain index from current blk000??.dat files
-.TP
-\fB\-par=\fR<n>
-Set the number of script verification threads (1\-16, 0=auto, default: 0)
-.SS "Block creation options:"
-.TP
-\fB\-blockminsize=\fR<n>
-Set minimum block size in bytes (default: 0)
-.TP
-\fB\-blockmaxsize=\fR<n>
-Set maximum block size in bytes (default: 250000)
-.HP
-\fB\-blockprioritysize=\fR<n> Set maximum size of high\-priority/low\-fee transactions in bytes (default: 27000)
-.PP
-Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)
-.SS "UI options:"
-.TP
-\fB\-lang=\fR<lang>
-Set language, for example "de_DE" (default: system locale)
-.TP
-\fB\-min\fR
-Start minimized
-.TP
-\fB\-splash\fR
-Show splash screen on startup (default: 1)
+List options.
+.SH "SEE ALSO"
+bitcoind(1)
diff --git a/contrib/debian/manpages/bitcoin.conf.5 b/contrib/debian/manpages/bitcoin.conf.5
index 0cf4d991e3..839dc26c1a 100644
--- a/contrib/debian/manpages/bitcoin.conf.5
+++ b/contrib/debian/manpages/bitcoin.conf.5
@@ -1,75 +1,15 @@
-.TH BITCOIN.CONF "5" "January 2011" "bitcoin.conf 3.19"
+.TH BITCOIN.CONF "5" "February 2016" "bitcoin.conf 0.12"
.SH NAME
bitcoin.conf \- bitcoin configuration file
.SH SYNOPSIS
All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file.
.TP
-The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character.
+The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to bitcoind(1) for a up to date list of valid options.
.TP
The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments.
.SH LOCATION
bitcoin.conf should be located in $HOME/.bitcoin
-.SH NETWORK-RELATED SETTINGS
-.TP
-.TP
-\fBtestnet=\fR[\fI'1'\fR|\fI'0'\fR]
-Enable or disable run on the test network instead of the real *bitcoin* network.
-.TP
-\fBproxy=\fR\fI'127.0.0.1:9050'\fR
-Connect via a socks4 proxy.
-.TP
-\fBaddnode=\fR\fI'10.0.0.2:8333'\fR
-Use as many *addnode=* settings as you like to connect to specific peers.
-.TP
-\fBconnect=\fR\fI'10.0.0.1:8333'\fR
-Use as many *connect=* settings as you like to connect ONLY to specific peers.
-.TP
-\fRmaxconnections=\fR\fI'value'\fR
-Maximum number of inbound+outbound connections.
-.SH JSON-RPC OPTIONS
-.TP
-\fBserver=\fR[\fI'1'\fR|\fI'0'\fR]
-Tells *bitcoin* to accept or not accept JSON-RPC commands.
-.TP
-\fBrpcuser=\fR\fI'username'\fR
-You must set *rpcuser* to secure the JSON-RPC api.
-.TP
-\fBrpcpassword=\fR\fI'password'\fR
-You must set *rpcpassword* to secure the JSON-RPC api.
-.TP
-\fBrpcallowip=\fR\fI'192.168.1.*'\fR
-By default, only RPC connections from localhost are allowed. Specify as many *rpcallowip=* settings as you like to allow connections from other hosts (and you may use * as a wildcard character).
-.TP
-\fBrpcport=\fR\fI'8332'\fR
-Listen for RPC connections on this TCP port.
-.TP
-\fBrpcconnect=\fR\fI'127.0.0.1'\fR
-You can use *bitcoin* or *bitcoind(1)* to send commands to *bitcoin*/*bitcoind(1)* running on another host using this option.
-.TP
-.SH MISCELLANEOUS OPTIONS
-.TP
-\fBgen=\fR[\fI'0'\fR|\fI'1'\fR]
-Enable or disable attempt to generate bitcoins.
-.TP
-\fB4way=\fR[\fI'0'\fR|\fI'1'\fR]
-Enable or disable use SSE instructions to try to generate bitcoins faster.
-.TP
-\fBkeypool=\fR\fI'100'\fR
-Pre-generate this many public/private key pairs, so wallet backups will be valid for both prior transactions and several dozen future transactions.
-.TP
-\fBpaytxfee=\fR\fI'0.00'\fR
-Pay an optional transaction fee every time you send bitcoins. Transactions with fees are more likely than free transactions to be included in generated blocks, so may be validated sooner.
-.TP
-\fBallowreceivebyip=\fR\fI'1'\fR
-Allow direct connections for the 'pay via IP address' feature.
-.TP
-.SH USER INTERFACE OPTIONS
-.TP
-\fBmin=\fR[\fI'0'\fR|\fI'1'\fR]
-Enable or disable start bitcoind minimized.
-.TP
-\fBminimizetotray=\fR[\fI'0'\fR|\fI'1'\fR]
-Enable or disable minimize to the system tray.
+
.SH "SEE ALSO"
bitcoind(1)
.SH AUTHOR
diff --git a/contrib/debian/manpages/bitcoind.1 b/contrib/debian/manpages/bitcoind.1
index 5b0f2921aa..5c3e52f441 100644
--- a/contrib/debian/manpages/bitcoind.1
+++ b/contrib/debian/manpages/bitcoind.1
@@ -1,4 +1,4 @@
-.TH BITCOIND "1" "January 2011" "bitcoind 3.19"
+.TH BITCOIND "1" "February 2016" "bitcoind 0.12"
.SH NAME
bitcoind \- peer-to-peer network based digital currency
.SH SYNOPSIS
@@ -6,185 +6,20 @@ bitcoin [options] <command> [params]
.TP
bitcoin [options] help <command> \- Get help for a command
.SH DESCRIPTION
-This manual page documents the bitcoind program. Bitcoin is a peer-to-peer digital currency. Peer-to-peer (P2P) means that there is no central authority to issue new money or keep track of transactions. Instead, these tasks are managed collectively by the nodes of the network. Advantages:
-
-Bitcoins can be sent easily through the Internet, without having to trust middlemen. Transactions are designed to be irreversible. Be safe from instability caused by fractional reserve banking and central banks. The limited inflation of the Bitcoin system’s money supply is distributed evenly (by CPU power) throughout the network, not monopolized by banks.
+This manual page documents the bitcoind program. Bitcoin is an experimental new digital currency that enables instant payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate with no central authority: managing transactions and issuing money are carried out collectively by the network. Bitcoin Core is the name of open source software which enables the use of this currency.
.SH OPTIONS
.TP
-\fB\-conf=\fR<file>
-Specify configuration file (default: bitcoin.conf)
-.TP
-\fB\-gen\fR
-Generate coins
-.TP
-\fB\-gen\fR=\fI0\fR
-Don't generate coins
-.TP
-\fB\-min\fR
-Start minimized
-.TP
-\fB\-datadir=\fR<dir>
-Specify data directory
-.TP
-\fB\-proxy=\fR<ip:port>
-Connect through SOCKS5 proxy
-.TP
-\fB\-addnode=\fR<ip>
-Add a node to connect to
-.TP
-\fB\-connect=\fR<ip>
-Connect only to the specified node
-.TP
-\fB\-paytxfee=\fR<amt>
-Fee per KB to add to transactions you send
-.TP
-\fB\-server\fR
-Accept command line and JSON\-RPC commands
-.TP
-\fB\-daemon\fR
-Run in the background as a daemon and accept commands
-.TP
-\fB\-testnet\fR
-Use the test network
-.TP
-\fB\-rpcuser=\fR<user>
-Username for JSON\-RPC connections
-.TP
-\fB\-rpcpassword=\fR<pw>
-Password for JSON\-RPC connections
-.TP
-\fB\-rpcport=\fR<port>
-Listen for JSON\-RPC connections on <port>
-.TP
-\fB\-rpcallowip=\fR<ip>
-Allow JSON\-RPC connections from specified IP address
-.TP
-\fB\-rpcconnect=\fR<ip>
-Send commands to node running on <ip>
-.TP
\-?
-This help message
+List of possible options.
.SH COMMANDS
.TP
-\fBbackupwallet 'destination'\fR
-Safely copies *wallet.dat* to 'destination', which can be a directory or a path with filename.
-.TP
-\fBgetaccount 'bitcoinaddress'\fR
-DEPRECATED. Returns the account associated with the given address.
-.TP
-\fBsetaccount 'bitcoinaddress' ['account']\fR
-DEPRECATED. Sets the ['account'] associated with the given address. ['account'] may be omitted to remove an address from ['account'].
-.TP
-\fBgetaccountaddress 'account'\fR
-DEPRECATED. Returns a new bitcoin address for 'account'.
-.TP
-\fBgetaddressesbyaccount 'account'\fR
-DEPRECATED. Returns the list of addresses associated with the given 'account'.
-.TP
-\fBgetbalance 'account'\fR
-Returns the server's available balance, or the balance for 'account' (accounts are deprecated).
-.TP
-\fBgetblockcount\fR
-Returns the number of blocks in the longest block chain.
-.TP
-\fBgetblocknumber\fR
-Returns the block number of the latest block in the longest block chain.
-.TP
-\fBgetconnectioncount\fR
-Returns the number of connections to other nodes.
-.TP
-\fBgetdifficulty\fR
-Returns the proof-of-work difficulty as a multiple of the minimum difficulty.
-.TP
-\fBgetgenerate\fR
-Returns boolean true if server is trying to generate bitcoins, false otherwise.
-.TP
-\fBsetgenerate 'generate' ['genproclimit']\fR
-Generation is limited to ['genproclimit'] processors, \-1 is unlimited.
-.TP
-\fBgethashespersec\fR
-Returns a recent hashes per second performance measurement while generating.
-.TP
-\fBgetinfo\fR
-Returns an object containing server information.
-.TP
-\fBgetnewaddress 'account'\fR
-Returns a new bitcoin address for receiving payments. If 'account' is specified (deprecated), it is added to the address book so payments received with the address will be credited to 'account'.
-.TP
-\fBgetreceivedbyaccount 'account' ['minconf=1']\fR
-DEPRECATED. Returns the total amount received by addresses associated with 'account' in transactions with at least ['minconf'] confirmations.
-.TP
-\fBgetreceivedbyaddress 'bitcoinaddress' ['minconf=1']\fR
-Returns the total amount received by 'bitcoinaddress' in transactions with at least ['minconf'] confirmations.
-.TP
-\fBgettransaction 'txid'\fR
-Returns information about a specific transaction, given hexadecimal transaction ID.
-.TP
-\fBgetwork 'data'\fR
-If 'data' is specified, tries to solve the block and returns true if it was successful. If 'data' is not specified, returns formatted hash 'data' to work on:
+\fBhelp\fR
+List commands.
- "midstate" : precomputed hash state after hashing the first half of the data.
- "data" : block data.
- "hash1" : formatted hash buffer for second hash.
- "target" : little endian hash target.
.TP
\fBhelp 'command'\fR
-List commands, or get help for a command.
-.TP
-\fBlistaccounts ['minconf=1']\fR
-DEPRECATED. List accounts and their current balances.
- *note: requires bitcoin 0.3.20 or later.
-.TP
-\fBlistreceivedbyaccount ['minconf=1'] ['includeempty=false']\fR
-['minconf'] is the minimum number of confirmations before payments are included. ['includeempty'] whether to include addresses that haven't received any payments. Returns an array of objects containing:
-
- "account" : DEPRECATED. the account of the receiving address.
- "amount" : total amount received by the address.
- "confirmations" : number of confirmations of the most recent transaction included.
-.TP
-\fBlistreceivedbyaddress ['minconf=1'] ['includeempty=false']\fR
-['minconf'] is the minimum number of confirmations before payments are included. ['includeempty'] whether to include addresses that haven't received any payments. Returns an array of objects containing:
-
- "address" : receiving address.
- "account" : DEPRECATED. the account of the receiving address.
- "amount" : total amount received by the address.
- "confirmations" : number of confirmations of the most recent transaction included.
-.TP
-\fBlisttransactions 'account' ['count=10']\fR
-Returns a list of the last ['count'] transactions for 'account' \- for all accounts if 'account' is not specified or is "*". Each entry in the list may contain:
-
- "category" : will be generate, send, receive, or move.
- "amount" : amount of transaction.
- "fee" : Fee (if any) paid (only for send transactions).
- "confirmations" : number of confirmations (only for generate/send/receive).
- "txid" : transaction ID (only for generate/send/receive).
- "otheraccount" : account funds were moved to or from (only for move).
- "message" : message associated with transaction (only for send).
- "to" : message-to associated with transaction (only for send).
-
- *note: requires bitcoin 0.3.20 or later.
-.TP
-\fBmove <'fromaccount'> <'toaccount'> <'amount'> ['minconf=1'] ['comment']\fR
-DEPRECATED. Moves funds between accounts.
-.TP
-\fBsendfrom* <'account'> <'bitcoinaddress'> <'amount'> ['minconf=1'] ['comment'] ['comment-to']\fR
-DEPRECATED. Sends amount from account's balance to 'bitcoinaddress'. This method will fail if there is less than amount bitcoins with ['minconf'] confirmations in the account's balance (unless account is the empty-string-named default account; it behaves like the *sendtoaddress* method). Returns transaction ID on success.
-.TP
-\fBsendtoaddress 'bitcoinaddress' 'amount' ['comment'] ['comment-to']\fR
-Sends amount from the server's available balance to 'bitcoinaddress'. amount is a real and is rounded to the nearest 0.01. Returns transaction id on success.
-.TP
-\fBstop\fR
-Stops the bitcoin server.
-.TP
-\fBvalidateaddress 'bitcoinaddress'\fR
-Checks that 'bitcoinaddress' looks like a proper bitcoin address. Returns an object containing:
-
- "isvalid" : true or false.
- "ismine" : true if the address is in the server's wallet.
- "address" : bitcoinaddress.
-
- *note: ismine and address are only returned if the address is valid.
+Get help for a command.
.SH "SEE ALSO"
bitcoin.conf(5)
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index 2e70c5adcc..1103ca86c5 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -2,19 +2,68 @@ Contents
========
This directory contains tools for developers working on this repository.
+check-doc.py
+============
+
+Check if all command line args are documented. The return value indicates the
+number of undocumented args.
+
clang-format.py
===============
A script to format cpp source code according to [.clang-format](../../src/.clang-format). This should only be applied to new files or files which are currently not actively developed on. Also, git subtrees are not subject to formatting.
-github-merge.sh
+clang-format-diff.py
+===================
+
+A script to format unified git diffs according to [.clang-format](../../src/.clang-format).
+
+For instance, to format the last commit with 0 lines of context,
+the script should be called from the git root folder as follows.
+
+```
+git diff -U0 HEAD~1.. | ./contrib/devtools/clang-format-diff.py -p1 -i -v
+```
+
+fix-copyright-headers.py
+========================
+
+Every year newly updated files need to have its copyright headers updated to reflect the current year.
+If you run this script from the root folder it will automatically update the year on the copyright header for all
+source files if these have a git commit from the current year.
+
+For example a file changed in 2015 (with 2015 being the current year):
+
+```// Copyright (c) 2009-2013 The Bitcoin Core developers```
+
+would be changed to:
+
+```// Copyright (c) 2009-2015 The Bitcoin Core developers```
+
+git-subtree-check.sh
+====================
+
+Run this script from the root of the repository to verify that a subtree matches the contents of
+the commit it claims to have been updated to.
+
+To use, make sure that you have fetched the upstream repository branch in which the subtree is
+maintained:
+* for `src/secp256k1`: https://github.com/bitcoin/secp256k1.git (branch master)
+* for `src/leveldb`: https://github.com/bitcoin/leveldb.git (branch bitcoin-fork)
+* for `src/univalue`: https://github.com/bitcoin/univalue.git (branch master)
+
+Usage: `git-subtree-check.sh DIR COMMIT`
+
+`COMMIT` may be omitted, in which case `HEAD` is used.
+
+github-merge.py
===============
A small script to automate merging pull-requests securely and sign them with GPG.
For example:
- ./github-merge.sh bitcoin/bitcoin 3077
+ ./github-merge.py 3077
(in any git repository) will help you merge pull request #3077 for the
bitcoin/bitcoin repository.
@@ -41,21 +90,6 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey mykeyid (if you want to GPG sign)
-fix-copyright-headers.py
-========================
-
-Every year newly updated files need to have its copyright headers updated to reflect the current year.
-If you run this script from src/ it will automatically update the year on the copyright header for all
-.cpp and .h files if these have a git commit from the current year.
-
-For example a file changed in 2014 (with 2014 being the current year):
-
-```// Copyright (c) 2009-2013 The Bitcoin Core developers```
-
-would be changed to:
-
-```// Copyright (c) 2009-2014 The Bitcoin Core developers```
-
optimize-pngs.py
================
@@ -98,18 +132,3 @@ It will do the following automatically:
- add missing translations to the build system (TODO)
See doc/translation-process.md for more information.
-
-git-subtree-check.sh
-====================
-
-Run this script from the root of the repository to verify that a subtree matches the contents of
-the commit it claims to have been updated to.
-
-To use, make sure that you have fetched the upstream repository branch in which the subtree is
-maintained:
-* for src/secp256k1: https://github.com/bitcoin/secp256k1.git (branch master)
-* for sec/leveldb: https://github.com/bitcoin/leveldb.git (branch bitcoin-fork)
-
-Usage: git-subtree-check.sh DIR COMMIT
-
-COMMIT may be omitted, in which case HEAD is used.
diff --git a/contrib/devtools/check-doc.py b/contrib/devtools/check-doc.py
new file mode 100755
index 0000000000..8c73cf1e8a
--- /dev/null
+++ b/contrib/devtools/check-doc.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# Copyright (c) 2015 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+'''
+This checks if all command line args are documented.
+Return value is 0 to indicate no error.
+
+Author: @MarcoFalke
+'''
+
+from subprocess import check_output
+import re
+
+FOLDER_GREP = 'src'
+FOLDER_TEST = 'src/test/'
+CMD_ROOT_DIR = '`git rev-parse --show-toplevel`/%s' % FOLDER_GREP
+CMD_GREP_ARGS = r"egrep -r -I '(map(Multi)?Args(\.count\(|\[)|Get(Bool)?Arg\()\"\-[^\"]+?\"' %s | grep -v '%s'" % (CMD_ROOT_DIR, FOLDER_TEST)
+CMD_GREP_DOCS = r"egrep -r -I 'HelpMessageOpt\(\"\-[^\"=]+?(=|\")' %s" % (CMD_ROOT_DIR)
+REGEX_ARG = re.compile(r'(?:map(?:Multi)?Args(?:\.count\(|\[)|Get(?:Bool)?Arg\()\"(\-[^\"]+?)\"')
+REGEX_DOC = re.compile(r'HelpMessageOpt\(\"(\-[^\"=]+?)(?:=|\")')
+# list unsupported, deprecated and duplicate args as they need no documentation
+SET_DOC_OPTIONAL = set(['-rpcssl', '-benchmark', '-h', '-help', '-socks', '-tor', '-debugnet', '-whitelistalwaysrelay'])
+
+def main():
+ used = check_output(CMD_GREP_ARGS, shell=True)
+ docd = check_output(CMD_GREP_DOCS, shell=True)
+
+ args_used = set(re.findall(REGEX_ARG,used))
+ args_docd = set(re.findall(REGEX_DOC,docd)).union(SET_DOC_OPTIONAL)
+ args_need_doc = args_used.difference(args_docd)
+ args_unknown = args_docd.difference(args_used)
+
+ print "Args used : %s" % len(args_used)
+ print "Args documented : %s" % len(args_docd)
+ print "Args undocumented: %s" % len(args_need_doc)
+ print args_need_doc
+ print "Args unknown : %s" % len(args_unknown)
+ print args_unknown
+
+ exit(len(args_need_doc))
+
+if __name__ == "__main__":
+ main()
diff --git a/contrib/devtools/clang-format-diff.py b/contrib/devtools/clang-format-diff.py
new file mode 100755
index 0000000000..13d2573b9f
--- /dev/null
+++ b/contrib/devtools/clang-format-diff.py
@@ -0,0 +1,164 @@
+#!/usr/bin/env python
+#
+#===- clang-format-diff.py - ClangFormat Diff Reformatter ----*- python -*--===#
+#
+# The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License.
+#
+# ============================================================
+#
+# University of Illinois/NCSA
+# Open Source License
+#
+# Copyright (c) 2007-2015 University of Illinois at Urbana-Champaign.
+# All rights reserved.
+#
+# Developed by:
+#
+# LLVM Team
+#
+# University of Illinois at Urbana-Champaign
+#
+# http://llvm.org
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal with
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+#
+# * Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimers.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimers in the
+# documentation and/or other materials provided with the distribution.
+#
+# * Neither the names of the LLVM Team, University of Illinois at
+# Urbana-Champaign, nor the names of its contributors may be used to
+# endorse or promote products derived from this Software without specific
+# prior written permission.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+# SOFTWARE.
+#
+# ============================================================
+#
+#===------------------------------------------------------------------------===#
+
+r"""
+ClangFormat Diff Reformatter
+============================
+
+This script reads input from a unified diff and reformats all the changed
+lines. This is useful to reformat all the lines touched by a specific patch.
+Example usage for git/svn users:
+
+ git diff -U0 HEAD^ | clang-format-diff.py -p1 -i
+ svn diff --diff-cmd=diff -x-U0 | clang-format-diff.py -i
+
+"""
+
+import argparse
+import difflib
+import re
+import string
+import subprocess
+import StringIO
+import sys
+
+
+# Change this to the full path if clang-format is not on the path.
+binary = 'clang-format'
+
+
+def main():
+ parser = argparse.ArgumentParser(description=
+ 'Reformat changed lines in diff. Without -i '
+ 'option just output the diff that would be '
+ 'introduced.')
+ parser.add_argument('-i', action='store_true', default=False,
+ help='apply edits to files instead of displaying a diff')
+ parser.add_argument('-p', metavar='NUM', default=0,
+ help='strip the smallest prefix containing P slashes')
+ parser.add_argument('-regex', metavar='PATTERN', default=None,
+ help='custom pattern selecting file paths to reformat '
+ '(case sensitive, overrides -iregex)')
+ parser.add_argument('-iregex', metavar='PATTERN', default=
+ r'.*\.(cpp|cc|c\+\+|cxx|c|cl|h|hpp|m|mm|inc|js|ts|proto'
+ r'|protodevel|java)',
+ help='custom pattern selecting file paths to reformat '
+ '(case insensitive, overridden by -regex)')
+ parser.add_argument('-sort-includes', action='store_true', default=False,
+ help='let clang-format sort include blocks')
+ parser.add_argument('-v', '--verbose', action='store_true',
+ help='be more verbose, ineffective without -i')
+ args = parser.parse_args()
+
+ # Extract changed lines for each file.
+ filename = None
+ lines_by_file = {}
+ for line in sys.stdin:
+ match = re.search('^\+\+\+\ (.*?/){%s}(\S*)' % args.p, line)
+ if match:
+ filename = match.group(2)
+ if filename == None:
+ continue
+
+ if args.regex is not None:
+ if not re.match('^%s$' % args.regex, filename):
+ continue
+ else:
+ if not re.match('^%s$' % args.iregex, filename, re.IGNORECASE):
+ continue
+
+ match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
+ if match:
+ start_line = int(match.group(1))
+ line_count = 1
+ if match.group(3):
+ line_count = int(match.group(3))
+ if line_count == 0:
+ continue
+ end_line = start_line + line_count - 1;
+ lines_by_file.setdefault(filename, []).extend(
+ ['-lines', str(start_line) + ':' + str(end_line)])
+
+ # Reformat files containing changes in place.
+ for filename, lines in lines_by_file.iteritems():
+ if args.i and args.verbose:
+ print 'Formatting', filename
+ command = [binary, filename]
+ if args.i:
+ command.append('-i')
+ if args.sort_includes:
+ command.append('-sort-includes')
+ command.extend(lines)
+ command.extend(['-style=file', '-fallback-style=none'])
+ p = subprocess.Popen(command, stdout=subprocess.PIPE,
+ stderr=None, stdin=subprocess.PIPE)
+ stdout, stderr = p.communicate()
+ if p.returncode != 0:
+ sys.exit(p.returncode);
+
+ if not args.i:
+ with open(filename) as f:
+ code = f.readlines()
+ formatted_code = StringIO.StringIO(stdout).readlines()
+ diff = difflib.unified_diff(code, formatted_code,
+ filename, filename,
+ '(before formatting)', '(after formatting)')
+ diff_string = string.join(diff, '')
+ if len(diff_string) > 0:
+ sys.stdout.write(diff_string)
+
+if __name__ == '__main__':
+ main()
diff --git a/contrib/devtools/fix-copyright-headers.py b/contrib/devtools/fix-copyright-headers.py
index 5e84952548..b6414a551f 100755
--- a/contrib/devtools/fix-copyright-headers.py
+++ b/contrib/devtools/fix-copyright-headers.py
@@ -1,53 +1,46 @@
#!/usr/bin/env python
'''
-Run this script inside of src/ and it will look for all the files
-that were changed this year that still have the last year in the
-copyright headers, and it will fix the headers on that file using
-a perl regex one liner.
+Run this script to update all the copyright headers of files
+that were changed this year.
-For example: if it finds something like this and we're in 2014
+For example:
-// Copyright (c) 2009-2013 The Bitcoin Core developers
+// Copyright (c) 2009-2012 The Bitcoin Core developers
it will change it to
-// Copyright (c) 2009-2014 The Bitcoin Core developers
-
-It will do this for all the files in the folder and its children.
-
-Author: @gubatron
+// Copyright (c) 2009-2015 The Bitcoin Core developers
'''
import os
import time
+import re
year = time.gmtime()[0]
-last_year = year - 1
-command = "perl -pi -e 's/%s The Bitcoin/%s The Bitcoin/' %s"
-listFilesCommand = "find . | grep %s"
-
-extensions = [".cpp",".h"]
-
-def getLastGitModifiedDate(filePath):
- gitGetLastCommitDateCommand = "git log " + filePath +" | grep Date | head -n 1"
- p = os.popen(gitGetLastCommitDateCommand)
- result = ""
- for l in p:
- result = l
- break
- result = result.replace("\n","")
- return result
+CMD_GIT_DATE = 'git log --format=@%%at -1 %s | date +"%%Y" -u -f -'
+CMD_REGEX= "perl -pi -e 's/(20\d\d)(?:-20\d\d)? The Bitcoin/$1-%s The Bitcoin/' %s"
+REGEX_CURRENT= re.compile("%s The Bitcoin" % year)
+CMD_LIST_FILES= "find %s | grep %s"
-n=1
-for extension in extensions:
- foundFiles = os.popen(listFilesCommand % extension)
- for filePath in foundFiles:
- filePath = filePath[1:-1]
- if filePath.endswith(extension):
- filePath = os.getcwd() + filePath
- modifiedTime = getLastGitModifiedDate(filePath)
- if len(modifiedTime) > 0 and str(year) in modifiedTime:
- print n,"Last Git Modified: ", modifiedTime, " - ", filePath
- os.popen(command % (last_year,year,filePath))
- n = n + 1
+FOLDERS = ["./qa", "./src"]
+EXTENSIONS = [".cpp",".h", ".py"]
+def get_git_date(file_path):
+ r = os.popen(CMD_GIT_DATE % file_path)
+ for l in r:
+ # Result is one line, so just return
+ return l.replace("\n","")
+ return ""
+n=1
+for folder in FOLDERS:
+ for extension in EXTENSIONS:
+ for file_path in os.popen(CMD_LIST_FILES % (folder, extension)):
+ file_path = os.getcwd() + file_path[1:-1]
+ if file_path.endswith(extension):
+ git_date = get_git_date(file_path)
+ if str(year) == git_date:
+ # Only update if current year is not found
+ if REGEX_CURRENT.search(open(file_path, "r").read()) is None:
+ print n,"Last git edit", git_date, "-", file_path
+ os.popen(CMD_REGEX % (year,file_path))
+ n = n + 1
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
new file mode 100755
index 0000000000..c8dcaae268
--- /dev/null
+++ b/contrib/devtools/github-merge.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python2
+# Copyright (c) 2016 Bitcoin Core Developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+# This script will locally construct a merge commit for a pull request on a
+# github repository, inspect it, sign it and optionally push it.
+
+# The following temporary branches are created/overwritten and deleted:
+# * pull/$PULL/base (the current master we're merging onto)
+# * pull/$PULL/head (the current state of the remote pull request)
+# * pull/$PULL/merge (github's merge)
+# * pull/$PULL/local-merge (our merge)
+
+# In case of a clean merge that is accepted by the user, the local branch with
+# name $BRANCH is overwritten with the merged result, and optionally pushed.
+from __future__ import division,print_function,unicode_literals
+import os,sys
+from sys import stdin,stdout,stderr
+import argparse
+import subprocess
+
+# External tools (can be overridden using environment)
+GIT = os.getenv('GIT','git')
+BASH = os.getenv('BASH','bash')
+
+# OS specific configuration for terminal attributes
+ATTR_RESET = ''
+ATTR_PR = ''
+COMMIT_FORMAT = '%h %s (%an)%d'
+if os.name == 'posix': # if posix, assume we can use basic terminal escapes
+ ATTR_RESET = '\033[0m'
+ ATTR_PR = '\033[1;36m'
+ COMMIT_FORMAT = '%C(bold blue)%h%Creset %s %C(cyan)(%an)%Creset%C(green)%d%Creset'
+
+def git_config_get(option, default=None):
+ '''
+ Get named configuration option from git repository.
+ '''
+ try:
+ return subprocess.check_output([GIT,'config','--get',option]).rstrip()
+ except subprocess.CalledProcessError as e:
+ return default
+
+def retrieve_pr_title(repo,pull):
+ '''
+ Retrieve pull request title from github.
+ Return None if no title can be found, or an error happens.
+ '''
+ import urllib2,json
+ try:
+ req = urllib2.Request("https://api.github.com/repos/"+repo+"/pulls/"+pull)
+ result = urllib2.urlopen(req)
+ result = json.load(result)
+ return result['title']
+ except Exception as e:
+ print('Warning: unable to retrieve pull title from github: %s' % e)
+ return None
+
+def ask_prompt(text):
+ print(text,end=" ",file=stderr)
+ reply = stdin.readline().rstrip()
+ print("",file=stderr)
+ return reply
+
+def parse_arguments(branch):
+ epilog = '''
+ In addition, you can set the following git configuration variables:
+ githubmerge.repository (mandatory),
+ user.signingkey (mandatory),
+ githubmerge.host (default: git@github.com),
+ githubmerge.branch (default: master),
+ githubmerge.testcmd (default: none).
+ '''
+ parser = argparse.ArgumentParser(description='Utility to merge, sign and push github pull requests',
+ epilog=epilog)
+ parser.add_argument('pull', metavar='PULL', type=int, nargs=1,
+ help='Pull request ID to merge')
+ parser.add_argument('branch', metavar='BRANCH', type=str, nargs='?',
+ default=branch, help='Branch to merge against (default: '+branch+')')
+ return parser.parse_args()
+
+def main():
+ # Extract settings from git repo
+ repo = git_config_get('githubmerge.repository')
+ host = git_config_get('githubmerge.host','git@github.com')
+ branch = git_config_get('githubmerge.branch','master')
+ testcmd = git_config_get('githubmerge.testcmd')
+ signingkey = git_config_get('user.signingkey')
+ if repo is None:
+ print("ERROR: No repository configured. Use this command to set:", file=stderr)
+ print("git config githubmerge.repository <owner>/<repo>", file=stderr)
+ exit(1)
+ if signingkey is None:
+ print("ERROR: No GPG signing key set. Set one using:",file=stderr)
+ print("git config --global user.signingkey <key>",file=stderr)
+ exit(1)
+
+ host_repo = host+":"+repo # shortcut for push/pull target
+
+ # Extract settings from command line
+ args = parse_arguments(branch)
+ pull = str(args.pull[0])
+ branch = args.branch
+
+ # Initialize source branches
+ head_branch = 'pull/'+pull+'/head'
+ base_branch = 'pull/'+pull+'/base'
+ merge_branch = 'pull/'+pull+'/merge'
+ local_merge_branch = 'pull/'+pull+'/local-merge'
+
+ devnull = open(os.devnull,'w')
+ try:
+ subprocess.check_call([GIT,'checkout','-q',branch])
+ except subprocess.CalledProcessError as e:
+ print("ERROR: Cannot check out branch %s." % (branch), file=stderr)
+ exit(3)
+ try:
+ subprocess.check_call([GIT,'fetch','-q',host_repo,'+refs/pull/'+pull+'/*:refs/heads/pull/'+pull+'/*'])
+ except subprocess.CalledProcessError as e:
+ print("ERROR: Cannot find pull request #%s on %s." % (pull,host_repo), file=stderr)
+ exit(3)
+ try:
+ subprocess.check_call([GIT,'log','-q','-1','refs/heads/'+head_branch], stdout=devnull, stderr=stdout)
+ except subprocess.CalledProcessError as e:
+ print("ERROR: Cannot find head of pull request #%s on %s." % (pull,host_repo), file=stderr)
+ exit(3)
+ try:
+ subprocess.check_call([GIT,'log','-q','-1','refs/heads/'+merge_branch], stdout=devnull, stderr=stdout)
+ except subprocess.CalledProcessError as e:
+ print("ERROR: Cannot find merge of pull request #%s on %s." % (pull,host_repo), file=stderr)
+ exit(3)
+ try:
+ subprocess.check_call([GIT,'fetch','-q',host_repo,'+refs/heads/'+branch+':refs/heads/'+base_branch])
+ except subprocess.CalledProcessError as e:
+ print("ERROR: Cannot find branch %s on %s." % (branch,host_repo), file=stderr)
+ exit(3)
+ subprocess.check_call([GIT,'checkout','-q',base_branch])
+ subprocess.call([GIT,'branch','-q','-D',local_merge_branch], stderr=devnull)
+ subprocess.check_call([GIT,'checkout','-q','-b',local_merge_branch])
+
+ try:
+ # Create unsigned merge commit.
+ title = retrieve_pr_title(repo,pull)
+ if title:
+ firstline = 'Merge #%s: %s' % (pull,title)
+ else:
+ firstline = 'Merge #%s' % (pull,)
+ message = firstline + '\n\n'
+ message += subprocess.check_output([GIT,'log','--no-merges','--topo-order','--pretty=format:%h %s (%an)',base_branch+'..'+head_branch]).decode('utf-8')
+ try:
+ subprocess.check_call([GIT,'merge','-q','--commit','--no-edit','--no-ff','-m',message.encode('utf-8'),head_branch])
+ except subprocess.CalledProcessError as e:
+ print("ERROR: Cannot be merged cleanly.",file=stderr)
+ subprocess.check_call([GIT,'merge','--abort'])
+ exit(4)
+ logmsg = subprocess.check_output([GIT,'log','--pretty=format:%s','-n','1']).decode('utf-8')
+ if logmsg.rstrip() != firstline.rstrip():
+ print("ERROR: Creating merge failed (already merged?).",file=stderr)
+ exit(4)
+
+ print('%s#%s%s %s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title))
+ subprocess.check_call([GIT,'log','--graph','--topo-order','--pretty=format:'+COMMIT_FORMAT,base_branch+'..'+head_branch])
+ print()
+ # Run test command if configured.
+ if testcmd:
+ # Go up to the repository's root.
+ toplevel = subprocess.check_output([GIT,'rev-parse','--show-toplevel']).strip()
+ os.chdir(toplevel)
+ if subprocess.call(testcmd,shell=True):
+ print("ERROR: Running %s failed." % testcmd,file=stderr)
+ exit(5)
+
+ # Show the created merge.
+ diff = subprocess.check_output([GIT,'diff',merge_branch+'..'+local_merge_branch])
+ subprocess.check_call([GIT,'diff',base_branch+'..'+local_merge_branch])
+ if diff:
+ print("WARNING: merge differs from github!",file=stderr)
+ reply = ask_prompt("Type 'ignore' to continue.")
+ if reply.lower() == 'ignore':
+ print("Difference with github ignored.",file=stderr)
+ else:
+ exit(6)
+ reply = ask_prompt("Press 'd' to accept the diff.")
+ if reply.lower() == 'd':
+ print("Diff accepted.",file=stderr)
+ else:
+ print("ERROR: Diff rejected.",file=stderr)
+ exit(6)
+ else:
+ # Verify the result manually.
+ print("Dropping you on a shell so you can try building/testing the merged source.",file=stderr)
+ print("Run 'git diff HEAD~' to show the changes being merged.",file=stderr)
+ print("Type 'exit' when done.",file=stderr)
+ if os.path.isfile('/etc/debian_version'): # Show pull number on Debian default prompt
+ os.putenv('debian_chroot',pull)
+ subprocess.call([BASH,'-i'])
+ reply = ask_prompt("Type 'm' to accept the merge.")
+ if reply.lower() == 'm':
+ print("Merge accepted.",file=stderr)
+ else:
+ print("ERROR: Merge rejected.",file=stderr)
+ exit(7)
+
+ # Sign the merge commit.
+ reply = ask_prompt("Type 's' to sign off on the merge.")
+ if reply == 's':
+ try:
+ subprocess.check_call([GIT,'commit','-q','--gpg-sign','--amend','--no-edit'])
+ except subprocess.CalledProcessError as e:
+ print("Error signing, exiting.",file=stderr)
+ exit(1)
+ else:
+ print("Not signing off on merge, exiting.",file=stderr)
+ exit(1)
+
+ # Put the result in branch.
+ subprocess.check_call([GIT,'checkout','-q',branch])
+ subprocess.check_call([GIT,'reset','-q','--hard',local_merge_branch])
+ finally:
+ # Clean up temporary branches.
+ subprocess.call([GIT,'checkout','-q',branch])
+ subprocess.call([GIT,'branch','-q','-D',head_branch],stderr=devnull)
+ subprocess.call([GIT,'branch','-q','-D',base_branch],stderr=devnull)
+ subprocess.call([GIT,'branch','-q','-D',merge_branch],stderr=devnull)
+ subprocess.call([GIT,'branch','-q','-D',local_merge_branch],stderr=devnull)
+
+ # Push the result.
+ reply = ask_prompt("Type 'push' to push the result to %s, branch %s." % (host_repo,branch))
+ if reply.lower() == 'push':
+ subprocess.check_call([GIT,'push',host_repo,'refs/heads/'+branch])
+
+if __name__ == '__main__':
+ main()
+
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh
deleted file mode 100755
index afb53f0390..0000000000
--- a/contrib/devtools/github-merge.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/bash
-
-# This script will locally construct a merge commit for a pull request on a
-# github repository, inspect it, sign it and optionally push it.
-
-# The following temporary branches are created/overwritten and deleted:
-# * pull/$PULL/base (the current master we're merging onto)
-# * pull/$PULL/head (the current state of the remote pull request)
-# * pull/$PULL/merge (github's merge)
-# * pull/$PULL/local-merge (our merge)
-
-# In case of a clean merge that is accepted by the user, the local branch with
-# name $BRANCH is overwritten with the merged result, and optionally pushed.
-
-REPO="$(git config --get githubmerge.repository)"
-if [[ "d$REPO" == "d" ]]; then
- echo "ERROR: No repository configured. Use this command to set:" >&2
- echo "git config githubmerge.repository <owner>/<repo>" >&2
- echo "In addition, you can set the following variables:" >&2
- echo "- githubmerge.host (default git@github.com)" >&2
- echo "- githubmerge.branch (default master)" >&2
- echo "- githubmerge.testcmd (default none)" >&2
- exit 1
-fi
-
-HOST="$(git config --get githubmerge.host)"
-if [[ "d$HOST" == "d" ]]; then
- HOST="git@github.com"
-fi
-
-BRANCH="$(git config --get githubmerge.branch)"
-if [[ "d$BRANCH" == "d" ]]; then
- BRANCH="master"
-fi
-
-TESTCMD="$(git config --get githubmerge.testcmd)"
-
-PULL="$1"
-
-if [[ "d$PULL" == "d" ]]; then
- echo "Usage: $0 pullnumber [branch]" >&2
- exit 2
-fi
-
-if [[ "d$2" != "d" ]]; then
- BRANCH="$2"
-fi
-
-# Initialize source branches.
-git checkout -q "$BRANCH"
-if git fetch -q "$HOST":"$REPO" "+refs/pull/$PULL/*:refs/heads/pull/$PULL/*"; then
- if ! git log -q -1 "refs/heads/pull/$PULL/head" >/dev/null 2>&1; then
- echo "ERROR: Cannot find head of pull request #$PULL on $HOST:$REPO." >&2
- exit 3
- fi
- if ! git log -q -1 "refs/heads/pull/$PULL/merge" >/dev/null 2>&1; then
- echo "ERROR: Cannot find merge of pull request #$PULL on $HOST:$REPO." >&2
- exit 3
- fi
-else
- echo "ERROR: Cannot find pull request #$PULL on $HOST:$REPO." >&2
- exit 3
-fi
-if git fetch -q "$HOST":"$REPO" +refs/heads/"$BRANCH":refs/heads/pull/"$PULL"/base; then
- true
-else
- echo "ERROR: Cannot find branch $BRANCH on $HOST:$REPO." >&2
- exit 3
-fi
-git checkout -q pull/"$PULL"/base
-git branch -q -D pull/"$PULL"/local-merge 2>/dev/null
-git checkout -q -b pull/"$PULL"/local-merge
-TMPDIR="$(mktemp -d -t ghmXXXXX)"
-
-function cleanup() {
- git checkout -q "$BRANCH"
- git branch -q -D pull/"$PULL"/head 2>/dev/null
- git branch -q -D pull/"$PULL"/base 2>/dev/null
- git branch -q -D pull/"$PULL"/merge 2>/dev/null
- git branch -q -D pull/"$PULL"/local-merge 2>/dev/null
- rm -rf "$TMPDIR"
-}
-
-# Create unsigned merge commit.
-(
- echo "Merge pull request #$PULL"
- echo ""
- git log --no-merges --topo-order --pretty='format:%h %s (%an)' pull/"$PULL"/base..pull/"$PULL"/head
-)>"$TMPDIR/message"
-if git merge -q --commit --no-edit --no-ff -m "$(<"$TMPDIR/message")" pull/"$PULL"/head; then
- if [ "d$(git log --pretty='format:%s' -n 1)" != "dMerge pull request #$PULL" ]; then
- echo "ERROR: Creating merge failed (already merged?)." >&2
- cleanup
- exit 4
- fi
-else
- echo "ERROR: Cannot be merged cleanly." >&2
- git merge --abort
- cleanup
- exit 4
-fi
-
-# Run test command if configured.
-if [[ "d$TESTCMD" != "d" ]]; then
- # Go up to the repository's root.
- while [ ! -d .git ]; do cd ..; done
- if ! $TESTCMD; then
- echo "ERROR: Running $TESTCMD failed." >&2
- cleanup
- exit 5
- fi
- # Show the created merge.
- git diff pull/"$PULL"/merge..pull/"$PULL"/local-merge >"$TMPDIR"/diff
- git diff pull/"$PULL"/base..pull/"$PULL"/local-merge
- if [[ "$(<"$TMPDIR"/diff)" != "" ]]; then
- echo "WARNING: merge differs from github!" >&2
- read -p "Type 'ignore' to continue. " -r >&2
- if [[ "d$REPLY" =~ ^d[iI][gG][nN][oO][rR][eE]$ ]]; then
- echo "Difference with github ignored." >&2
- else
- cleanup
- exit 6
- fi
- fi
- read -p "Press 'd' to accept the diff. " -n 1 -r >&2
- echo
- if [[ "d$REPLY" =~ ^d[dD]$ ]]; then
- echo "Diff accepted." >&2
- else
- echo "ERROR: Diff rejected." >&2
- cleanup
- exit 6
- fi
-else
- # Verify the result.
- echo "Dropping you on a shell so you can try building/testing the merged source." >&2
- echo "Run 'git diff HEAD~' to show the changes being merged." >&2
- echo "Type 'exit' when done." >&2
- if [[ -f /etc/debian_version ]]; then # Show pull number in prompt on Debian default prompt
- export debian_chroot="$PULL"
- fi
- bash -i
- read -p "Press 'm' to accept the merge. " -n 1 -r >&2
- echo
- if [[ "d$REPLY" =~ ^d[Mm]$ ]]; then
- echo "Merge accepted." >&2
- else
- echo "ERROR: Merge rejected." >&2
- cleanup
- exit 7
- fi
-fi
-
-# Sign the merge commit.
-read -p "Press 's' to sign off on the merge. " -n 1 -r >&2
-echo
-if [[ "d$REPLY" =~ ^d[Ss]$ ]]; then
- if [[ "$(git config --get user.signingkey)" == "" ]]; then
- echo "ERROR: No GPG signing key set, not signing. Set one using:" >&2
- echo "git config --global user.signingkey <key>" >&2
- cleanup
- exit 1
- else
- if ! git commit -q --gpg-sign --amend --no-edit; then
- echo "Error signing, exiting."
- cleanup
- exit 1
- fi
- fi
-else
- echo "Not signing off on merge, exiting."
- cleanup
- exit 1
-fi
-
-# Clean up temporary branches, and put the result in $BRANCH.
-git checkout -q "$BRANCH"
-git reset -q --hard pull/"$PULL"/local-merge
-cleanup
-
-# Push the result.
-read -p "Type 'push' to push the result to $HOST:$REPO, branch $BRANCH. " -r >&2
-if [[ "d$REPLY" =~ ^d[Pp][Uu][Ss][Hh]$ ]]; then
- git push "$HOST":"$REPO" refs/heads/"$BRANCH"
-fi
diff --git a/contrib/devtools/security-check.py b/contrib/devtools/security-check.py
index e96eaa9c38..0319f739c4 100755
--- a/contrib/devtools/security-check.py
+++ b/contrib/devtools/security-check.py
@@ -1,7 +1,7 @@
#!/usr/bin/python2
'''
Perform basic ELF security checks on a series of executables.
-Exit status will be 0 if succesful, and the program will be silent.
+Exit status will be 0 if successful, and the program will be silent.
Otherwise the exit status will be 1 and it will log which executables failed which checks.
Needs `readelf` (for ELF) and `objdump` (for PE).
'''
@@ -94,7 +94,7 @@ def check_ELF_RELRO(executable):
raise IOError('Error opening file')
for line in stdout.split('\n'):
tokens = line.split()
- if len(tokens)>1 and tokens[1] == '(BIND_NOW)':
+ if len(tokens)>1 and tokens[1] == '(BIND_NOW)' or (len(tokens)>2 and tokens[1] == '(FLAGS)' and 'BIND_NOW' in tokens[2]):
have_bindnow = True
return have_gnu_relro and have_bindnow
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
index 93acfcdda4..4ad5136f79 100755
--- a/contrib/devtools/symbol-check.py
+++ b/contrib/devtools/symbol-check.py
@@ -42,9 +42,12 @@ MAX_VERSIONS = {
'GLIBCXX': (3,4,13),
'GLIBC': (2,11)
}
+# See here for a description of _IO_stdin_used:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634261#109
+
# Ignore symbols that are exported as part of every executable
IGNORE_EXPORTS = {
-'_edata', '_end', '_init', '__bss_start', '_fini'
+'_edata', '_end', '_init', '__bss_start', '_fini', '_IO_stdin_used'
}
READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
diff --git a/contrib/devtools/update-translations.py b/contrib/devtools/update-translations.py
index f955e4a1f2..2b6e807b47 100755
--- a/contrib/devtools/update-translations.py
+++ b/contrib/devtools/update-translations.py
@@ -29,6 +29,8 @@ TX = 'tx'
SOURCE_LANG = 'bitcoin_en.ts'
# Directory with locale files
LOCALE_DIR = 'src/qt/locale'
+# Minimum number of messages for translation to be considered at all
+MIN_NUM_MESSAGES = 10
def check_at_repository_root():
if not os.path.exists('.git'):
@@ -37,7 +39,7 @@ def check_at_repository_root():
exit(1)
def fetch_all_translations():
- if subprocess.call([TX, 'pull', '-f']):
+ if subprocess.call([TX, 'pull', '-f', '-a']):
print('Error while fetching translations', file=sys.stderr)
exit(1)
@@ -70,7 +72,7 @@ def sanitize_string(s):
'''Sanitize string for printing'''
return s.replace('\n',' ')
-def check_format_specifiers(source, translation, errors):
+def check_format_specifiers(source, translation, errors, numerus):
source_f = split_format_specifiers(find_format_specifiers(source))
# assert that no source messages contain both Qt and strprintf format specifiers
# if this fails, go change the source as this is hacky and confusing!
@@ -78,10 +80,13 @@ def check_format_specifiers(source, translation, errors):
try:
translation_f = split_format_specifiers(find_format_specifiers(translation))
except IndexError:
- errors.append("Parse error in translation '%s'" % sanitize_string(translation))
+ errors.append("Parse error in translation for '%s': '%s'" % (sanitize_string(source), sanitize_string(translation)))
return False
else:
if source_f != translation_f:
+ if numerus and source_f == (set(), ['n']) and translation_f == (set(), []) and translation.find('%') == -1:
+ # Allow numerus translations to omit %n specifier (usually when it only has one possible value)
+ return True
errors.append("Mismatch between '%s' and '%s'" % (sanitize_string(source), sanitize_string(translation)))
return False
return True
@@ -148,7 +153,7 @@ def postprocess_translations(reduce_diff_hacks=False):
if translation is None:
continue
errors = []
- valid = check_format_specifiers(source, translation, errors)
+ valid = check_format_specifiers(source, translation, errors, numerus)
for error in errors:
print('%s: %s' % (filename, error))
@@ -166,6 +171,15 @@ def postprocess_translations(reduce_diff_hacks=False):
if translation_node.get('type') == 'unfinished':
context.remove(message)
+ # check if document is (virtually) empty, and remove it if so
+ num_messages = 0
+ for context in root.findall('context'):
+ for message in context.findall('message'):
+ num_messages += 1
+ if num_messages < MIN_NUM_MESSAGES:
+ print('Removing %s, as it contains only %i messages' % (filepath, num_messages))
+ continue
+
# write fixed-up tree
# if diff reduction requested, replace some XML to 'sanitize' to qt formatting
if reduce_diff_hacks:
diff --git a/contrib/gitian-descriptors/README.md b/contrib/gitian-descriptors/README.md
index 07c2ba98b1..6149706596 100644
--- a/contrib/gitian-descriptors/README.md
+++ b/contrib/gitian-descriptors/README.md
@@ -1,8 +1,7 @@
-### Gavin's notes on getting gitian builds up and running using KVM:###
+### Gavin's notes on getting gitian builds up and running using KVM
-These instructions distilled from:
-[ https://help.ubuntu.com/community/KVM/Installation]( https://help.ubuntu.com/community/KVM/Installation)
-... see there for complete details.
+These instructions distilled from
+[https://help.ubuntu.com/community/KVM/Installation](https://help.ubuntu.com/community/KVM/Installation).
You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
@@ -33,14 +32,14 @@ Once you've got the right hardware and software:
# Get inputs (see doc/release-process.md for exact inputs needed and where to get them)
...
- # For further build instructions see doc/release-notes.md
+ # For further build instructions see doc/release-process.md
...
---------------------
`gitian-builder` now also supports building using LXC. See
-[ https://help.ubuntu.com/12.04/serverguide/lxc.html]( https://help.ubuntu.com/12.04/serverguide/lxc.html)
-... for how to get LXC up and running under Ubuntu.
+[help.ubuntu.com](https://help.ubuntu.com/14.04/serverguide/lxc.html)
+for how to get LXC up and running under Ubuntu.
If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
and at least 10 gigabytes of free disk space, you can `gitian-build` using
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 0c3c439dd9..b4b6ed2909 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -1,5 +1,5 @@
---
-name: "bitcoin-linux-0.12"
+name: "bitcoin-linux-0.13"
enable_cache: true
suites:
- "trusty"
@@ -15,7 +15,9 @@ packages:
- "faketime"
- "bsdmainutils"
- "binutils-gold"
-reference_datetime: "2015-06-01 00:00:00"
+- "ca-certificates"
+- "python"
+reference_datetime: "2016-01-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
@@ -94,6 +96,8 @@ script: |
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
make ${MAKEOPTS}
+ make ${MAKEOPTS} -C src check-security
+ make ${MAKEOPTS} -C src check-symbols
make install-strip
cd installed
find . -name "lib*.la" -delete
diff --git a/contrib/gitian-descriptors/gitian-osx-signer.yml b/contrib/gitian-descriptors/gitian-osx-signer.yml
index d349a13dd2..c4165470af 100644
--- a/contrib/gitian-descriptors/gitian-osx-signer.yml
+++ b/contrib/gitian-descriptors/gitian-osx-signer.yml
@@ -5,9 +5,8 @@ suites:
architectures:
- "amd64"
packages:
-- "libc6:i386"
- "faketime"
-reference_datetime: "2015-06-01 00:00:00"
+reference_datetime: "2016-01-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin-detached-sigs.git"
"dir": "signature"
diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 0eb97d6a76..4a4592398b 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -1,11 +1,12 @@
---
-name: "bitcoin-osx-0.12"
+name: "bitcoin-osx-0.13"
enable_cache: true
suites:
- "trusty"
architectures:
- "amd64"
packages:
+- "ca-certificates"
- "g++"
- "git-core"
- "pkg-config"
@@ -21,10 +22,11 @@ packages:
- "libcap-dev"
- "libz-dev"
- "libbz2-dev"
+- "python"
- "python-dev"
- "python-setuptools"
- "fonts-tuffy"
-reference_datetime: "2015-06-01 00:00:00"
+reference_datetime: "2016-01-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml
index a29d7ab472..27c4f01eb4 100644
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -7,7 +7,7 @@ architectures:
packages:
- "libssl-dev"
- "autoconf"
-reference_datetime: "2015-06-01 00:00:00"
+reference_datetime: "2016-01-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin-detached-sigs.git"
"dir": "signature"
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index 6bb482d45f..233f5c5498 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -1,5 +1,5 @@
---
-name: "bitcoin-win-0.12"
+name: "bitcoin-win-0.13"
enable_cache: true
suites:
- "trusty"
@@ -18,7 +18,9 @@ packages:
- "g++-mingw-w64"
- "nsis"
- "zip"
-reference_datetime: "2015-06-01 00:00:00"
+- "ca-certificates"
+- "python"
+reference_datetime: "2016-01-01 00:00:00"
remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
@@ -124,6 +126,7 @@ script: |
./configure --prefix=${BASEPREFIX}/${i} --bindir=${INSTALLPATH}/bin --includedir=${INSTALLPATH}/include --libdir=${INSTALLPATH}/lib --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
make ${MAKEOPTS}
+ make ${MAKEOPTS} -C src check-security
make deploy
make install-strip
cp -f bitcoin-*setup*.exe $OUTDIR/
diff --git a/contrib/gitian-downloader/achow101-key.pgp b/contrib/gitian-downloader/achow101-key.pgp
new file mode 100644
index 0000000000..030fd5cf3c
--- /dev/null
+++ b/contrib/gitian-downloader/achow101-key.pgp
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFT4snkBEACx90Wf5XLo1Xv09p81eaOXc+8bbkSYzqx3ThDNUPRzjYpex9A9
+8FxfBenAykD3EgYuBTco4cbn7Dw11ppyXUw0VjWaagnnAVGxt3SDeY3ADwPss6xg
+78FZXxT06xSHZXq1X6pOqhwTAnx3VGx+tR/A2DCsX0vHE6IVThZqyUq2Ei2C0Chc
+od8y6JZ1CGNzlRkEgL9A0Zp0If6Uq4tXFxnLL6PtiS1b9V5rNfCSC7l99kIkG5oy
++SPsGRwVqTE2kqtuzkt9qVn6v8KKoZr0BY4IO3KMfJJ4eidOkB+OZK9REEQguDvv
+tJfkF2HcMYa1efvQObyvVIfS5gxs7+kcSJxgDVZI5YxRV1OOfI7+w3EW3G+bPBQF
+gSBwEaLbD+udr9lDZ4NZc7vTeoZtYVNZ+EQtG+6I9GzxJwEgO5LIwZ3//vh/R4iy
+z9W91r7TrlkHUuOGg1hXMCI9sRa65NJtP4BWD0xO07zDKj0JHzeyKwgxB/ixZF2V
+kc8EzJSKzRfr+638BMXONcf6NW8n6qIlJT2U2qIwiixjM8AUujGKb8DEgU1vIAn9
+7esOhceOtU/6iLuJrlK+TzMe97NoZCtt6ktmiAp8fu6l9uk3mr8JYLzIMtK+Asf4
+np5YLizABwbt9gEretnGpHrdKMN88mPYwsLjjCh9wiM0bHZNL52JQRkt3QARAQAB
+tDNBbmRyZXcgQ2hvdyAoT2ZmaWNpYWwgTmV3IEtleSkgPGFjaG93MTAxQGdtYWls
+LmNvbT6JAjYEEwEKACAFAlT4snkCGwMFCwkIBwMFFQoJCAsEFgIBAAIeAQIXgAAK
+CRAXVlcy4I5eQfyGD/9idtVjybuXl+LXS4ph4M738PrZfQeLDmnwhVjfZiEOLLs2
+sAwGtL/CC0t9f7K7y+n5HtQoMX52jfVehnTDzeKCjRMs+5ssou+L9zadIAz68beU
+7BZ0J1rR3n1kzwsFE3vx3IRno0VCTOgfL48AuuzMPxvEaLMxWQX8mL0PCV5/8Yxx
+ftqg4kQ1JKMt5UTxE9/w0cBMphLTwV1Rx6lZILPJgOxYSQ0oOzQYSmucwzH1uOqH
+wpgZ7SZIHfRWyi4TjQpU/5T2kMOlN/XdyWsj5+Eq+Y6zI6hq2se1vU3TOc8xN2S3
+7YOza1onUj4if0rWtkJZ2yDnR4lIASUD+/VP2NoWtoy7rB0vIfzbojfwxAp8WuHT
+sUTxXd52c3OB+673OlOA+GAg2FfFjR8REojsTbeip35/KmFMpafazVRn+E0c3MfP
+/iS43UTlcxewRcDrx/gRplmgO0+CLgLstZOon7Dz0msypeSArhX2xEj4tJb/ccKd
+CR/IQl8q/ULQsHX1LwRj0u9doAlkqgIQdKXou4+EmD1jKF92oJMZ+20AJCqfwYQY
+9HlCB9SQeCRUtU/fHkAZLPApze6C7a1r0LVIuM6iolWyha5KJ++mj84fAagwy/ag
+8TU8kHTLSGPYeg5G/TAbr1XU5kbbqfWfQFMK1xtdZd1BaGP2cDC2QGkr2ot1SLkC
+DQRU+LJ5ARAArDftuFPE+ZhgJRuJK163fsD15aHPfv5s+h8kPFv0AuwVs+D75w3y
+YGfaRtlwSvK+8EucKOoHI1AQYjTG0dtKJuwEGhQ2qsTWUKe05tEAWu0eN62MOZ/r
+Awjxqotj4TeFksfyKedVAYSizD0Xj16fizeWFrfUBNND4OgUgD8KM79oRchtzKBE
+HRBP27JksU8tQWc4YcEJUHV66Pji5OCiXxHXJ+JpqKSKeCrVvrvro+pwsY1I3ARA
+F4UmLxCcb4GnNq+s76cb2K7XJtWJu5FHeHOsef5ped43pYs35UXI+EvOYNs39XI4
+emMsI0KmuLME2LHO3CJNBirwRFxui27axZk/CSVE1lglnbb25n3QHvbs/31ASCCT
+QKZ7+Gce89iow6yG4MkN5W4hLdkGAyNI74b6yAUfugSqPLNSj3YHvVFY3y1acge+
+H7xDO/owRN1kbz+9VMJZxsxB/oZEyEVAE0szHxXbMBhqOME0Y3O6UBrXr7z6R8NG
+S20RPet4kxCCTLZOvM/X5FtvimgR2u5qRPHs+zf2VPXIRsJsM3zq9EvmePryGM3r
+1rEAvYagukuyt68lOWgKP/2wB0/NIFAs69b1QSJS3U4CQVIs2h84Ucvbh9gX9Y0B
+LbV5mxvDDfC/4Nhf4yMfH/CwZDLOUsaRAjCv/lQuN9mnMz9aYnsPha0AEQEAAYkC
+HwQYAQoACQUCVPiyeQIbDAAKCRAXVlcy4I5eQec+EACi14L8Vp7tw3tDm/Lrb9fM
+LHfoOnZiDCGaXhiXqckbTSogp7hU82m1fIy4VwY7DWbs1iIq7QdDJMBuNn174Qd3
+ZPxHeGwBbR04gEsHkbjXBAA5hMacLvmxYFiPlibz+AO4orUiYu/vlEXhXoFCjSlB
+pw0kUG8W8yQ/RyE7ryLv5/bT4LkwUWF7/+gdDzLUy1VeaPDKmBupKVSbEACe4QRH
+dUUqE3suKoJ/GylO2sGtFW8BM7+CffX+nvc8hJWzXdYW5InSh0omYJIypIgnQ1gM
+MhUdu4gbtYwo44Tlax2mTSg8vSVboYO6pBZVX3IEUnjRHLOCZVZIBFXIFdRrHXO8
+TTkzx9ZoDmZ/DH+Md1NDnS4QsvFbRO/EeDRQAI4cgGhCc4CTrrJSQv8jtl7x8OTx
+fnDUbE/n8pLV93j9t1Gd07h0VJSmYj3AR7PiefHS7s2yxS9oOqRayGBqrJFzd2gS
++oXvUBC6pUvM68NgNVCKH7HmIM9tFbqgy8kofTsVDkq9TEJRO+X4hn7UDNJhTjVE
+AVRUdku6CJR6wj3RPCbERSNB8uabuv1lgo41baeepLn+tJNO/4hilJ0zvEoryVnJ
+ldZ73mHRRRtXoPRXq7OKuDn10AvtYX8y3/q5z6XhLUePFKM91PO8GF0J6bNWrQSq
+Khvd4+XHE/ecjLOPvLweAg==
+=+hz7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/contrib/gitian-downloader/linux-download-config b/contrib/gitian-downloader/linux-download-config
deleted file mode 100644
index c0048d336e..0000000000
--- a/contrib/gitian-downloader/linux-download-config
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: bitcoin
-urls:
-- http://bitcoin.org/bitcoin-latest-linux-gitian.zip
-rss:
-- url:
- xpath: //item/link/text()
- pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip
-signers:
- 0A82509767C7D4A5D14DA2301AE1D35043E08E54:
- name: BlueMatt
- key: bluematt
- BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
- name: Devrandom
- key: devrandom
- E463A93F5F3117EEDE6C7316BD02942421F4889F:
- name: Luke-Jr
- key: luke-jr
- D762373D24904A3E42F33B08B9A408E71DAAC974:
- name: "Pieter Wuille"
- key: sipa
- 77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
- name: tcatm
- key: tcatm
- 01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
- name: "Gavin Andresen"
- key: gavinandresen
- 71A3B16735405025D447E8F274810B012346C9A6:
- name: "Wladimir J. van der Laan"
- key: laanwj
- AEC1884398647C47413C1C3FB1179EB7347DC10D:
- name: "Warren Togami"
- key: wtogami
- 9692B91BBF0E8D34DFD33B1882C5C009628ECF0C:
- name: michagogo
- key: michagogo
- E944AE667CF960B1004BC32FCA662BE18B877A60:
- name: "Andreas Schildbach"
- key: aschildbach
- C060A6635913D98A3587D7DB1C2491FFEB0EF770:
- name: "Cory Fields"
- key: "cfields"
- 37EC7D7B0A217CDB4B4E007E7FAB114267E4FA04:
- name: "Peter Todd"
- key: "petertodd"
diff --git a/contrib/gitian-downloader/win32-download-config b/contrib/gitian-downloader/win32-download-config
deleted file mode 100644
index 0ad3bdd4f3..0000000000
--- a/contrib/gitian-downloader/win32-download-config
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: bitcoin
-urls:
-- http://bitcoin.org/bitcoin-latest-win32-gitian.zip
-rss:
-- url:
- xpath: //item/link/text()
- pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip
-signers:
- 0A82509767C7D4A5D14DA2301AE1D35043E08E54:
- name: BlueMatt
- key: bluematt
- BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
- name: Devrandom
- key: devrandom
- E463A93F5F3117EEDE6C7316BD02942421F4889F:
- name: Luke-Jr
- key: luke-jr
- D762373D24904A3E42F33B08B9A408E71DAAC974:
- name: "Pieter Wuille"
- key: sipa
- 77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
- name: tcatm
- key: tcatm
- 01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
- name: "Gavin Andresen"
- key: gavinandresen
- 71A3B16735405025D447E8F274810B012346C9A6:
- name: "Wladimir J. van der Laan"
- key: laanwj
- AEC1884398647C47413C1C3FB1179EB7347DC10D:
- name: "Warren Togami"
- key: wtogami
- 9692B91BBF0E8D34DFD33B1882C5C009628ECF0C:
- name: michagogo
- key: michagogo
- E944AE667CF960B1004BC32FCA662BE18B877A60:
- name: "Andreas Schildbach"
- key: aschildbach
- C060A6635913D98A3587D7DB1C2491FFEB0EF770:
- name: "Cory Fields"
- key: "cfields"
- 37EC7D7B0A217CDB4B4E007E7FAB114267E4FA04:
- name: "Peter Todd"
- key: "petertodd"
diff --git a/contrib/seeds/README.md b/contrib/seeds/README.md
index 63647fa11a..c595f83eb9 100644
--- a/contrib/seeds/README.md
+++ b/contrib/seeds/README.md
@@ -3,6 +3,9 @@
Utility to generate the seeds.txt list that is compiled into the client
(see [src/chainparamsseeds.h](/src/chainparamsseeds.h) and other utilities in [contrib/seeds](/contrib/seeds)).
-The 512 seeds compiled into the 0.10 release were created from sipa's DNS seed data, like this:
+The seeds compiled into the release are created from sipa's DNS seed data, like this:
+
+ curl -s http://bitcoin.sipa.be/seeds.txt > seeds_main.txt
+ python makeseeds.py < seeds_main.txt > nodes_main.txt
+ python generate-seeds.py . > ../../src/chainparamsseeds.h
- curl -s http://bitcoin.sipa.be/seeds.txt | makeseeds.py
diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py
index 167c219c6e..a3d0352187 100755
--- a/contrib/seeds/generate-seeds.py
+++ b/contrib/seeds/generate-seeds.py
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright (c) 2014 Wladmir J. van der Laan
+# Copyright (c) 2014 Wladimir J. van der Laan
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
'''
diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt
index 17339d514a..f1854b27f9 100644
--- a/contrib/seeds/nodes_main.txt
+++ b/contrib/seeds/nodes_main.txt
@@ -1,879 +1,937 @@
-1.34.168.128:8333
-1.202.128.218:8333
-2.30.0.210:8333
-5.9.96.203:8333
-5.45.71.130:8333
-5.45.98.141:8333
-5.102.145.68:8333
-5.135.160.77:8333
-5.189.134.246:8333
-5.199.164.132:8333
-5.249.135.102:8333
-8.19.44.110:8333
-8.22.230.8:8333
-14.200.200.145:8333
-18.228.0.188:8333
-18.228.0.200:8333
-23.24.168.97:8333
-23.28.35.227:8333
-23.92.76.170:8333
-23.99.64.119:8333
-23.228.166.128:8333
-23.229.45.32:8333
-24.8.105.128:8333
-24.16.69.137:8333
-24.94.98.96:8333
-24.102.118.7:8333
-24.118.166.228:8333
-24.122.133.49:8333
-24.166.97.162:8333
-24.213.235.242:8333
-24.226.107.64:8333
-24.228.192.171:8333
-27.140.133.18:8333
-31.41.40.25:8333
-31.43.101.59:8333
-31.184.195.181:8333
-31.193.139.66:8333
-37.200.70.102:8333
-37.205.10.151:8333
-42.3.106.227:8333
-42.60.133.106:8333
-45.56.85.231:8333
-45.56.102.228:8333
-45.79.130.235:8333
-46.28.204.61:11101
-46.38.235.229:8333
-46.59.2.74:8333
-46.101.132.37:8333
-46.101.168.50:8333
-46.163.76.230:8333
+5.2.145.201:8333
+5.22.142.214:8333
+5.53.172.197:8333
+5.189.161.164:8333
+5.230.140.166:8333
+5.231.3.130:8333
+5.255.80.103:8333
+14.202.230.49:8333
+18.85.11.130:8333
+23.91.97.25:8333
+23.94.100.122:8333
+23.95.99.132:8333
+24.115.8.206:8333
+24.127.128.191:8333
+24.154.178.25:8333
+24.207.103.43:8333
+24.207.104.105:8333
+24.210.230.150:8333
+24.224.18.84:8333
+24.246.168.106:8333
+27.254.64.47:8333
+31.6.71.123:8333
+31.6.71.124:8333
+31.14.134.13:8333
+31.30.36.220:8333
+31.164.6.104:8333
+31.170.106.203:8333
+31.185.134.201:8333
+31.204.128.99:8333
+31.204.128.219:8333
+37.1.219.88:8333
+37.97.132.109:8333
+37.120.160.55:8333
+37.120.169.123:8333
+37.139.32.46:8333
+37.221.163.218:8333
+38.130.192.72:8333
+41.75.96.80:8333
+45.3.0.49:8333
+45.33.72.185:8333
+45.33.96.129:8333
+45.56.4.63:8333
+45.79.0.127:8333
+45.79.80.102:8333
+45.79.97.30:8333
+45.79.132.219:8333
+46.21.97.135:8333
+46.28.205.67:8333
+46.28.206.188:8333
+46.29.20.209:8333
+46.50.234.179:8333
+46.101.160.168:8333
+46.166.161.35:8333
46.166.161.103:8333
46.182.132.100:8333
-46.223.36.94:8333
+46.218.227.92:8333
+46.226.109.20:8333
46.227.66.132:8333
46.227.66.138:8333
+46.229.165.154:8333
+46.229.165.155:8333
+46.229.238.187:8333
+46.234.104.48:8333
46.239.107.74:8333
-46.249.39.100:8333
-46.250.98.108:8333
+46.244.0.138:8333
+46.254.72.195:8333
+50.5.13.44:8333
50.7.37.114:8333
-50.81.53.151:8333
-50.115.43.253:8333
-50.116.20.87:8333
-50.116.33.92:8333
-50.125.167.245:8333
-50.143.9.51:8333
-50.188.192.133:8333
-54.77.162.76:8333
-54.153.97.109:8333
-54.165.192.125:8333
-58.96.105.85:8333
-59.167.196.135:8333
-60.29.227.163:8333
+50.30.37.103:8333
+50.39.105.60:8333
+50.106.40.231:8333
+52.29.0.37:8333
+52.76.192.246:8333
+54.152.192.179:8333
+54.169.64.174:8333
+54.175.160.22:8333
+54.199.128.0:8333
+58.96.171.129:8333
+58.161.238.57:8333
+60.251.195.221:8333
61.35.225.19:8333
62.43.130.178:8333
-62.109.49.26:8333
-62.202.0.97:8333
-62.210.66.227:8333
-62.210.192.169:8333
-64.74.98.205:8333
-64.156.193.100:8333
+62.65.39.12:8333
+62.107.200.30:8333
+62.133.194.2:8333
+62.181.238.186:8333
+62.183.22.50:8333
+62.210.85.120:8333
+62.210.162.89:8333
+62.238.34.125:8333
+64.25.171.73:8333
+64.27.166.30:8333
+64.53.137.101:8333
+64.71.72.44:8333
+64.83.225.146:8333
+64.121.3.163:8333
64.203.102.86:8333
-64.229.142.48:8333
-65.96.193.165:8333
-66.30.3.7:8333
+65.94.131.59:8333
+65.188.136.233:8333
+66.11.162.218:8333
+66.23.228.133:8333
+66.90.137.89:8333
66.114.33.49:8333
-66.118.133.194:8333
-66.135.10.126:8333
+66.150.105.77:8333
66.172.10.4:8333
66.194.38.250:8333
66.194.38.253:8333
-66.215.192.104:8333
-67.60.98.115:8333
-67.164.35.36:8333
-67.191.162.244:8333
-67.207.195.77:8333
-67.219.233.140:8333
+66.194.38.254:8333
+66.231.97.172:8333
+66.240.237.155:8333
+67.159.13.34:8333
+67.205.74.206:8333
67.221.193.55:8333
-67.228.162.228:8333
-68.50.67.199:8333
-68.62.3.203:8333
+67.227.72.17:8333
+68.65.120.53:8333
68.65.205.226:9000
-68.106.42.191:8333
-68.150.181.198:8333
-68.196.196.106:8333
-68.224.194.81:8333
-69.46.5.194:8333
-69.50.171.238:8333
-69.64.43.152:8333
-69.65.41.13:8333
-69.90.132.200:8333
-69.143.1.243:8333
-69.146.98.216:8333
-69.165.246.38:8333
-69.207.6.135:8333
-69.251.208.26:8333
-70.38.1.101:8333
-70.38.9.66:8333
-70.90.2.18:8333
-71.58.228.226:8333
-71.199.11.189:8333
-71.199.193.202:8333
-71.205.232.181:8333
-71.236.200.162:8333
-72.24.73.186:8333
+68.144.4.34:8333
+69.39.49.199:8333
+69.50.171.205:8333
+69.65.41.21:8333
+69.113.98.61:8333
+69.119.97.39:8333
+69.146.70.124:8333
+69.193.71.2:8333
+70.46.10.237:8333
+70.80.200.187:8333
+70.185.97.117:8333
+71.254.160.25:8333
+72.28.203.5:8333
72.52.130.110:8333
-72.53.111.37:8333
+72.83.194.122:8333
+72.128.32.167:8333
+72.179.136.80:8333
72.235.38.70:8333
-73.31.171.149:8333
-73.32.137.72:8333
-73.137.133.238:8333
-73.181.192.103:8333
-73.190.2.60:8333
-73.195.192.137:8333
-73.222.35.117:8333
-74.57.199.180:8333
-74.82.233.205:8333
-74.85.66.82:8333
-74.101.224.127:8333
-74.113.69.16:8333
-74.122.235.68:8333
-74.193.68.141:8333
-74.208.164.219:8333
-75.100.37.122:8333
-75.145.149.169:8333
-75.168.34.20:8333
-76.20.44.240:8333
-76.100.70.17:8333
-76.168.3.239:8333
-76.186.140.103:8333
-77.92.68.221:8333
-77.109.101.142:8333
-77.110.11.86:8333
-77.242.108.18:8333
-78.46.96.150:9020
+74.50.44.193:8333
+74.72.60.83:8333
+74.80.234.116:8333
+74.207.233.193:8333
+75.112.233.128:8333
+75.118.166.197:8333
+75.140.0.241:8333
+75.159.240.66:8333
+75.174.5.26:8333
+76.72.160.252:8333
+76.72.160.254:8333
+76.74.170.112:8333
+76.79.201.54:8333
+76.175.166.164:8333
+76.179.105.27:8333
+77.68.37.200:8333
+77.234.49.196:8333
+77.247.229.93:8333
+78.24.72.78:8333
+78.47.32.147:8333
78.84.100.95:8333
+78.121.69.23:8333
+78.129.167.5:8333
+78.193.96.155:8333
+79.19.37.179:8333
79.132.230.144:8333
79.133.43.63:8333
-79.160.76.153:8333
-79.169.34.24:8333
-79.188.7.78:8333
-80.217.226.25:8333
-80.223.100.179:8333
-80.240.129.221:8333
-81.1.173.243:8333
+79.134.201.66:8333
+79.169.35.235:8333
+80.57.227.14:8333
+80.64.65.87:8333
+80.86.92.70:8333
+80.100.203.151:8333
+80.101.32.121:8333
+80.161.178.73:8333
+80.240.129.170:8333
81.7.11.50:8333
-81.7.16.17:8333
-81.66.111.3:8333
-81.80.9.71:8333
-81.140.43.138:8333
-81.171.34.37:8333
-81.174.247.50:8333
-81.181.155.53:8333
-81.184.5.253:8333
-81.187.69.130:8333
-81.230.3.84:8333
-82.42.128.51:8333
-82.74.226.21:8333
-82.142.75.50:8333
+81.7.11.55:8333
+81.17.17.40:9333
+81.30.39.83:8333
+81.90.36.7:9444
+81.136.224.77:8333
+81.162.231.211:8333
+81.184.0.143:8333
+81.198.128.86:8333
+82.11.33.229:8333
+82.79.128.134:8333
+82.118.233.111:8333
+82.135.139.30:8333
82.199.102.10:8333
-82.200.205.30:8333
+82.221.106.17:8333
82.221.108.21:8333
-82.221.128.35:8333
-82.238.124.41:8333
-82.242.0.245:8333
-83.76.123.110:8333
+82.221.108.27:8333
+83.137.41.3:8333
+83.142.197.168:8333
+83.143.130.19:8333
83.150.9.196:8333
-83.162.196.192:8333
-83.162.234.224:8333
-83.170.104.91:8333
+83.183.17.191:8333
+83.227.173.83:8333
+83.230.5.15:8333
+83.233.105.151:443
+83.246.75.8:8333
+83.250.133.158:8333
83.255.66.118:8334
-84.2.34.104:8333
-84.45.98.91:8333
-84.47.161.150:8333
-84.212.192.131:8333
-84.215.169.101:8333
-84.238.140.176:8333
-84.245.71.31:8333
-85.17.4.212:8333
+84.24.69.59:8333
+84.42.193.6:8333
+84.45.98.87:8333
+84.54.128.11:8333
+84.212.200.24:8333
+84.215.198.109:8333
+84.230.4.177:8333
+85.95.228.83:8333
+85.95.228.123:8333
85.114.128.134:8333
-85.159.237.191:8333
-85.166.130.189:8333
-85.199.4.228:8333
85.214.66.168:8333
-85.214.195.210:8333
-85.229.0.73:8333
-86.21.96.45:8333
-87.48.42.199:8333
-87.81.143.82:8333
-87.81.251.72:8333
-87.104.24.185:8333
-87.104.168.104:8333
-87.117.234.71:8333
-87.118.96.197:8333
-87.145.12.57:8333
-87.159.170.190:8333
-88.150.168.160:8333
-88.208.0.79:8333
-88.208.0.149:8333
+85.214.147.162:8333
+85.243.168.4:8333
+86.1.0.18:8333
+87.79.77.106:8333
+87.91.156.110:8333
+87.236.196.222:8333
+88.85.75.152:8333
+88.87.1.230:8333
+88.87.92.102:8333
+88.89.69.202:8333
+88.97.72.229:8333
+88.164.117.99:8333
+88.198.32.131:8333
+88.202.230.87:8333
+88.214.193.154:8343
88.214.194.226:8343
-89.1.11.32:8333
-89.36.235.108:8333
-89.67.96.2:15321
-89.98.16.41:8333
-89.108.72.195:8333
-89.156.35.157:8333
-89.163.227.28:8333
-89.212.33.237:8333
-89.212.160.165:8333
-89.231.96.83:8333
-89.248.164.64:8333
-90.149.193.199:8333
-91.77.239.245:8333
-91.106.194.97:8333
+89.10.155.88:8333
+89.46.101.44:8333
+89.163.224.212:8333
+89.174.248.20:8333
+89.202.231.198:8333
+89.212.75.6:8333
+90.149.38.172:8333
+90.169.106.139:8333
+91.64.101.150:8333
+91.65.196.179:8333
+91.121.80.17:8333
91.126.77.77:8333
-91.134.38.195:8333
-91.156.97.181:8333
+91.145.76.156:8333
+91.152.150.35:8333
+91.192.137.17:8333
+91.196.170.110:8333
+91.197.44.133:8333
91.207.68.144:8333
-91.209.77.101:8333
+91.210.105.28:8333
+91.211.102.101:8333
+91.211.106.34:8333
91.214.200.205:8333
-91.220.131.242:8333
-91.220.163.18:8333
-91.233.23.35:8333
-92.13.96.93:8333
-92.14.74.114:8333
+91.220.43.146:8333
+91.222.71.89:8333
+91.224.140.242:8333
+91.229.76.14:8333
92.27.7.209:8333
-92.221.228.13:8333
-92.255.207.73:8333
-93.72.167.148:8333
-93.74.163.234:8333
-93.123.174.66:8333
-93.152.166.29:8333
-93.181.45.188:8333
-94.19.12.244:8333
+92.51.167.88:8333
+92.247.229.163:8333
+93.84.114.106:8333
+93.113.36.172:8333
+93.188.224.253:8333
+94.75.239.69:8333
94.190.227.112:8333
-94.198.135.29:8333
+94.214.2.74:8333
94.224.162.65:8333
-94.226.107.86:8333
-94.242.198.161:8333
-95.31.10.209:8333
-95.65.72.244:8333
-95.84.162.95:8333
-95.90.139.46:8333
-95.183.49.27:8005
-95.215.47.133:8333
-96.23.67.85:8333
-96.44.166.190:8333
-97.93.225.74:8333
-98.26.0.34:8333
-98.27.225.102:8333
-98.229.117.229:8333
-98.249.68.125:8333
-98.255.5.155:8333
-99.101.240.114:8333
+94.236.198.253:8333
+94.242.229.158:8333
+95.84.138.99:8333
+95.95.168.87:8333
+95.110.234.93:8333
+95.130.9.200:8333
+95.165.168.168:8333
+95.170.235.254:8333
+95.211.130.154:8333
+96.46.68.104:8333
+96.127.202.148:8333
+97.76.171.35:8333
+98.160.160.67:8333
+99.126.197.187:8333
+99.198.173.1:8333
101.100.174.138:8333
-101.251.203.6:8333
-103.3.60.61:8333
-103.30.42.189:8333
+101.164.201.208:8333
103.224.165.48:8333
-104.36.83.233:8333
-104.37.129.22:8333
-104.54.192.251:8333
+104.128.225.223:8333
104.128.228.252:8333
-104.128.230.185:8334
-104.130.161.47:8333
-104.131.33.60:8333
-104.143.0.156:8333
-104.156.111.72:8333
-104.167.111.84:8333
-104.193.40.248:8333
-104.197.7.174:8333
-104.197.8.250:8333
-104.223.1.133:8333
-104.236.97.140:8333
+104.131.192.94:8333
+104.155.45.201:8334
+104.194.28.195:8663
+104.211.1.27:8333
+104.221.38.177:8333
+104.236.9.79:8333
+104.236.129.178:8333
+104.236.186.249:8333
+104.236.194.15:8333
104.238.128.214:8333
104.238.130.182:8333
106.38.234.84:8333
106.185.36.204:8333
+106.185.38.67:8333
107.6.4.145:8333
107.150.2.6:8333
107.150.40.234:8333
-107.155.108.130:8333
-107.161.182.115:8333
-107.170.66.231:8333
-107.190.128.226:8333
+107.170.13.184:8333
+107.181.250.216:8333
+107.191.101.111:8333
107.191.106.115:8333
-108.16.2.61:8333
-109.70.4.168:8333
-109.162.35.196:8333
-109.163.235.239:8333
-109.190.196.220:8333
-109.191.39.60:8333
+108.59.12.163:8333
+108.161.129.247:8333
+109.193.160.140:8333
+109.197.13.54:8333
+109.230.7.248:8333
109.234.106.191:8333
-109.238.81.82:8333
-114.76.147.27:8333
-115.28.224.127:8333
-115.68.110.82:18333
-118.97.79.218:8333
-118.189.207.197:8333
-119.228.96.233:8333
-120.147.178.81:8333
-121.41.123.5:8333
-121.67.5.230:8333
-122.107.143.110:8333
-123.2.170.98:8333
-123.110.65.94:8333
-123.193.139.19:8333
-125.239.160.41:8333
-128.101.162.193:8333
+109.236.137.80:8333
+109.251.161.121:8333
+112.65.231.226:8333
+115.70.166.57:8333
+115.159.42.80:8333
+117.18.73.34:8333
+118.67.201.40:8333
+118.100.86.246:8333
+118.110.104.152:8333
+119.224.64.141:8333
+120.55.193.136:8333
+122.106.169.178:8333
+123.203.174.15:8333
+123.255.232.94:8333
+124.148.165.165:8333
+124.232.141.31:8333
+128.30.92.69:8333
+128.39.141.182:8333
+128.84.167.20:8333
128.111.73.10:8333
-128.140.229.73:8333
-128.175.195.31:8333
-128.199.107.63:8333
-128.199.192.153:8333
+128.127.38.195:8333
+128.140.224.162:8333
+128.199.101.104:8333
+128.233.224.35:8333
128.253.3.193:20020
-129.123.7.7:8333
-130.89.160.234:8333
-131.72.139.164:8333
-131.191.112.98:8333
-133.1.134.162:8333
-134.19.132.53:8333
-137.226.34.42:8333
-141.41.2.172:8333
-141.255.128.204:8333
-142.217.12.106:8333
-143.215.129.126:8333
+130.180.228.138:8333
+130.185.144.213:8333
+130.255.73.207:8333
+133.218.233.11:8333
+134.249.128.23:8333
+136.159.234.234:8333
+137.116.160.176:8333
+139.162.2.145:8333
+139.162.23.117:8333
+141.134.69.253:8333
+141.255.162.215:8333
+144.122.163.187:8333
+145.131.3.54:8333
+145.255.4.94:8333
146.0.32.101:8337
-147.229.13.199:8333
-149.210.133.244:8333
-149.210.162.187:8333
+147.83.72.91:8333
+148.103.28.68:8333
+149.5.32.102:8333
+149.210.164.195:8333
150.101.163.241:8333
151.236.11.189:8333
-153.121.66.211:8333
-154.20.2.139:8333
-159.253.23.132:8333
+152.3.136.56:8333
+154.20.208.25:8333
+158.181.104.149:8333
+159.253.96.226:8333
+160.36.130.180:8333
+162.209.1.233:8333
+162.209.4.125:8333
162.209.106.123:8333
162.210.198.184:8333
-162.218.65.121:8333
-162.222.161.49:8333
-162.243.132.6:8333
-162.243.132.58:8333
162.248.99.164:53011
162.248.102.117:8333
-163.158.35.110:8333
-164.15.10.189:8333
-164.40.134.171:8333
+162.251.108.53:8333
+163.44.2.48:8333
+163.158.36.17:8333
166.230.71.67:8333
-167.160.161.199:8333
-168.103.195.250:8333
-168.144.27.112:8333
-168.158.129.29:8333
-170.75.162.86:8333
-172.90.99.174:8333
-172.245.5.156:8333
-173.23.166.47:8333
+167.160.36.62:8333
+167.160.169.92:8333
+168.93.129.220:8333
+169.55.99.84:8333
+169.228.66.43:8333
+172.9.169.242:8333
173.32.11.194:8333
-173.34.203.76:8333
-173.171.1.52:8333
-173.175.136.13:8333
-173.230.228.139:8333
-173.247.193.70:8333
-174.49.132.28:8333
-174.52.202.72:8333
-174.53.76.87:8333
-174.109.33.28:8333
-176.28.12.169:8333
-176.35.182.214:8333
-176.36.33.113:8333
-176.36.33.121:8333
-176.58.96.173:8333
-176.121.76.84:8333
+173.230.228.136:8333
+173.246.107.34:8333
+173.254.235.34:8333
+174.0.128.222:8333
+174.25.130.148:8333
+174.50.64.101:8333
+175.140.232.141:8333
+176.36.37.62:8333
+176.46.9.96:8333
+176.124.110.27:8333
+177.39.16.102:8333
+178.17.173.2:8333
+178.62.5.248:8333
178.62.70.16:8333
-178.62.111.26:8333
-178.76.169.59:8333
-178.79.131.32:8333
-178.162.199.216:8333
-178.175.134.35:8333
-178.248.111.4:8333
-178.254.1.170:8333
+178.62.203.185:8333
+178.79.160.118:8333
+178.169.206.244:8333
+178.193.234.62:8333
+178.199.96.108:8333
+178.254.18.96:8333
178.254.34.161:8333
-179.43.143.120:8333
-179.208.156.198:8333
-180.200.128.58:8333
-183.78.169.108:8333
-183.96.96.152:8333
-184.68.2.46:8333
-184.73.160.160:8333
-184.94.227.58:8333
-184.152.68.163:8333
-185.7.35.114:8333
-185.28.76.179:8333
-185.31.160.202:8333
-185.45.192.129:8333
-185.66.140.15:8333
-186.2.167.23:8333
-186.220.101.142:8333
-188.26.5.33:8333
-188.75.136.146:8333
-188.120.194.140:8333
-188.121.5.150:8333
-188.138.0.114:8333
+178.255.41.123:8333
+180.210.34.58:9801
+182.92.226.212:8333
+182.171.246.142:8333
+184.23.8.9:8333
+184.58.162.35:8333
+184.154.9.170:8333
+185.8.238.165:8333
+185.24.97.11:8333
+185.31.137.139:8333
+185.38.44.64:8333
+185.53.128.180:8333
+185.53.129.244:8333
+185.77.129.119:8333
+185.77.129.156:8333
+185.82.203.92:8333
+188.20.97.18:8333
+188.126.8.14:8333
188.138.33.239:8333
-188.166.0.82:8333
+188.155.136.70:8333
+188.166.229.112:8333
188.182.108.129:8333
-188.191.97.208:8333
-188.226.198.102:8001
-190.10.9.217:8333
-190.75.143.144:8333
-190.139.102.146:8333
-191.237.64.28:8333
-192.3.131.61:8333
-192.99.225.3:8333
-192.110.160.122:8333
+188.226.225.174:8010
+188.242.171.8:8333
+188.243.4.139:8333
+190.10.9.234:8333
+190.10.10.147:8333
+190.81.160.184:8333
+190.85.201.37:8333
+192.34.227.230:8333
+192.77.189.200:8333
+192.124.224.7:8333
192.146.137.1:8333
-192.183.198.204:8333
192.203.228.71:8333
+192.206.202.20:8333
193.0.109.3:8333
-193.12.238.204:8333
-193.91.200.85:8333
-193.234.225.156:8333
-194.6.233.38:8333
-194.63.143.136:8333
-194.126.100.246:8333
-195.134.99.195:8333
-195.159.111.98:8333
-195.159.226.139:8333
+193.41.229.130:8333
+193.41.229.156:8333
+193.49.43.219:8333
+193.147.71.120:8333
+193.179.65.233:8333
+193.183.99.46:8333
+193.192.37.135:8333
+193.234.224.195:8333
+194.58.108.213:8333
+194.187.96.2:8333
+194.255.31.59:8333
+195.36.6.101:8333
+195.58.238.243:8333
195.197.175.190:8333
-198.48.199.108:8333
-198.57.208.134:8333
+195.239.1.66:8333
+198.48.196.230:8333
+198.50.192.160:8333
198.57.210.27:8333
-198.62.109.223:8333
+198.84.195.179:8333
198.167.140.8:8333
-198.167.140.18:8333
-199.91.173.234:8333
+198.204.224.106:8333
199.127.226.245:8333
-199.180.134.116:8333
-200.7.96.99:8333
-201.160.106.86:8333
-202.55.87.45:8333
-202.60.68.242:8333
-202.60.69.232:8333
-202.124.109.103:8333
-203.30.197.77:8333
-203.88.160.43:8333
+199.201.110.8:8333
+199.233.234.90:8333
+200.116.98.185:8333
+202.60.70.18:8333
203.151.140.14:8333
-203.219.14.204:8333
-205.147.40.62:8333
-207.235.39.214:8333
-207.244.73.8:8333
-208.12.64.225:8333
+204.112.203.52:8333
+205.200.247.149:8333
+207.226.141.253:8333
+207.255.42.202:8333
+208.53.164.19:8333
+208.66.68.127:8333
+208.66.68.130:8333
+208.71.171.232:8341
208.76.200.200:8333
-209.40.96.121:8333
-209.126.107.176:8333
-209.141.40.149:8333
-209.190.75.59:8333
-209.208.111.142:8333
-210.54.34.164:8333
-211.72.66.229:8333
+208.82.98.189:8333
+208.85.193.31:8333
+208.111.48.41:8333
+208.111.48.45:8333
+209.34.232.72:8333
+209.81.9.223:8333
+209.90.224.2:8333
+209.90.224.4:8333
+209.126.98.174:8333
+209.136.72.69:8333
+209.195.4.74:8333
+209.197.13.62:8333
+211.72.227.8:8333
212.51.144.42:8333
-212.112.33.157:8333
-212.116.72.63:8333
+212.71.233.127:8333
212.126.14.122:8333
+212.159.44.50:8333
+213.5.36.58:8333
+213.57.33.10:8333
213.66.205.194:8333
-213.111.196.21:8333
-213.122.107.102:8333
-213.136.75.175:8333
+213.136.73.125:8333
+213.155.3.216:8333
213.155.7.24:8333
-213.163.64.31:8333
-213.163.64.208:8333
-213.165.86.136:8333
-213.184.8.22:8333
+213.167.17.6:8333
+213.223.138.13:8333
216.15.78.182:8333
-216.55.143.154:8333
-216.115.235.32:8333
-216.126.226.166:8333
-216.145.67.87:8333
+216.38.129.164:8333
+216.48.168.8:8333
216.169.141.169:8333
-216.249.92.230:8333
+216.245.206.181:8333
+216.249.204.161:8333
216.250.138.230:8333
+217.11.225.189:8333
+217.12.34.158:8333
+217.12.202.33:8333
217.20.171.43:8333
-217.23.2.71:8333
-217.23.2.242:8333
-217.25.9.76:8333
-217.40.226.169:8333
-217.123.98.9:8333
-217.155.36.62:8333
+217.23.1.126:8333
+217.23.11.138:8333
+217.111.66.79:8333
+217.155.202.191:8333
+217.158.9.102:8333
217.172.32.18:20993
-218.61.196.202:8333
-218.231.205.41:8333
-220.233.77.200:8333
-223.18.226.85:8333
-223.197.203.82:8333
-223.255.166.142:8333
+220.245.196.37:8333
[2001:1291:2bf:1::100]:8333
-[2001:1418:100:5c2::2]:8333
-[2001:16d8:dd24:0:86c9:681e:f931:256]:8333
-[2001:19f0:1624:e6::579d:9428]:8333
-[2001:19f0:300:1340:225:90ff:fec9:2b6d]:8333
-[2001:19f0:4009:1405::64]:8333
-[2001:1b40:5000:2e::3fb0:6571]:8333
+[2001:1620:f00:282::2]:8333
+[2001:1620:f00:8282::1]:8333
+[2001:19f0:5000:8de8:5400:ff:fe12:55e4]:8333
+[2001:19f0:6c00:9103:5400:ff:fe10:a8d3]:8333
+[2001:1b60:3:172:142b:6dff:fe7a:117]:8333
[2001:410:a000:4050:8463:90b0:fffb:4e58]:8333
-[2001:410:a002:cafe:8463:90b0:fffb:4e58]:8333
-[2001:41d0:1:541e::1]:8333
-[2001:41d0:1:6a34::3]:8333
+[2001:4128:6135:2010:21e:bff:fee8:a3c0]:8333
+[2001:41d0:1008:761::17c]:8333
+[2001:41d0:1:45d8::1]:8333
[2001:41d0:1:6cd3::]:8333
[2001:41d0:1:8b26::1]:8333
-[2001:41d0:1:a33d::1]:8333
-[2001:41d0:1:b855::1]:8333
+[2001:41d0:1:afda::]:8200
+[2001:41d0:1:b26b::1]:8333
[2001:41d0:1:c139::1]:8333
[2001:41d0:1:c8d7::1]:8333
-[2001:41d0:1:dd3f::1]:8333
-[2001:41d0:1:e29d::1]:8333
[2001:41d0:1:f59f::33]:8333
[2001:41d0:1:f7cc::1]:8333
-[2001:41d0:1:ff87::1]:8333
-[2001:41d0:2:2f05::1]:8333
+[2001:41d0:2:1021::1]:8333
[2001:41d0:2:37c3::]:8200
-[2001:41d0:2:3e13::1]:8333
-[2001:41d0:2:8619::]:8333
+[2001:41d0:2:4797:2323:2323:2323:2323]:8333
+[2001:41d0:2:53df::]:8333
[2001:41d0:2:9c94::1]:8333
+[2001:41d0:2:9d3e::1]:8333
[2001:41d0:2:a24f::]:8333
-[2001:41d0:2:adbf::]:8333
-[2001:41d0:2:b721::1]:8333
-[2001:41d0:2:ee52::1]:8333
+[2001:41d0:2:a35a::]:8333
+[2001:41d0:2:b2b8::]:8333
+[2001:41d0:2:c1d9::]:8333
+[2001:41d0:2:c6e::]:8333
+[2001:41d0:2:c9bf::]:8333
[2001:41d0:2:f1a5::]:8333
-[2001:41d0:2:fa54::1]:8333
-[2001:41d0:51:1::2036]:8333
-[2001:41d0:52:a00::1a1]:8333
+[2001:41d0:52:a00::105f]:8333
[2001:41d0:52:cff::6f5]:8333
-[2001:41d0:52:d00::2c0]:8333
-[2001:41d0:52:d00::cf2]:8333
-[2001:41d0:8:1087::1]:8333
-[2001:41d0:8:4a3c::b7c]:8333
+[2001:41d0:52:d00::6e2]:8333
+[2001:41d0:8:3e75::1]:8333
+[2001:41d0:8:62ab::1]:8333
[2001:41d0:8:6728::]:8333
-[2001:41d0:8:b779::1]:8333
-[2001:41d0:8:c30f::1]:8333
-[2001:41d0:8:d2b2::1]:8333
-[2001:41d0:8:d5c3::1]:8333
+[2001:41d0:8:b30a::1]:8333
+[2001:41d0:8:bc26::1]:8333
+[2001:41d0:8:be9a::1]:8333
+[2001:41d0:8:d984::]:8333
[2001:41d0:8:eb8b::]:8333
-[2001:41d0:a:16d0::1]:8333
+[2001:41d0:a:13a2::1]:8333
[2001:41d0:a:2b18::1]:8333
-[2001:41d0:a:3a9c::1]:8333
-[2001:41d0:a:4903::]:8333
-[2001:41d0:a:57b::1]:8333
-[2001:41d0:a:5c7a::]:8333
+[2001:41d0:a:2d14::]:8333
+[2001:41d0:a:4558::1df2:76d3]:8333
+[2001:41d0:a:4aaa::]:8333
+[2001:41d0:a:635b::1]:8333
+[2001:41d0:a:63d8::1]:8333
[2001:41d0:a:6c29::1]:8333
-[2001:41d0:a:f482::1]:8333
-[2001:41d0:b:854:b7c:b7c:b7c:b7c]:8333
-[2001:41d0:d:111c::]:8333
-[2001:44b8:4116:7801:4216:7eff:fe78:3fe4]:8333
-[2001:470:1f08:837::2]:8333
-[2001:470:1f08:c33::2]:8333
-[2001:470:1f09:bca:218:7dff:fe10:be33]:8333
-[2001:470:1f0f:22d::212:26]:8333
+[2001:41d0:a:f9cd::1]:8333
+[2001:41d0:d:20a4::]:8333
+[2001:41d0:e:26b::1]:8333
+[2001:41d0:fc8c:a200:7a24:afff:fe9d:c69b]:8333
+[2001:41f0:61::7]:8333
+[2001:41f0::2]:8333
+[2001:44b8:41bd:6101:148e:4022:4950:e861]:8333
+[2001:470:1:2f9:0:1:107a:a301]:8333
+[2001:470:1f0b:ad6::2]:8333
[2001:470:1f11:12d5::ae1:5611]:8333
-[2001:470:1f14:57a::2]:8333
[2001:470:1f14:7d::2]:8333
-[2001:470:1f15:57c::1]:8333
-[2001:470:1f15:dda:3d9a:3f11:9a56:ed64]:8333
-[2001:470:25:482::2]:8333
-[2001:470:25:e4::2]:8333
-[2001:470:4:26b::2]:8333
+[2001:470:27:ce::2]:8333
+[2001:470:41:6::2]:8333
+[2001:470:507d:0:6ab5:99ff:fe73:ac18]:8333
+[2001:470:583e::2a]:8333
[2001:470:5f:5f::232]:8333
[2001:470:66:119::2]:8333
-[2001:470:67:39d::71]:8333
[2001:470:6c4f::cafe]:8333
-[2001:470:8:2e1::43]:8333
-[2001:470:90a7:96::afe:6021]:8333
+[2001:470:6f:327:913b:7fe:8545:a4f5]:8333
+[2001:470:7dda:1::1]:8333
[2001:470:95c1::2]:8333
[2001:470:b1d0:ffff::1000]:8333
-[2001:470:c1f2:3::201]:8333
[2001:470:d00d:0:3664:a9ff:fe9a:5150]:8333
-[2001:470:e250:0:211:11ff:feb9:924c]:8333
-[2001:4800:7817:101:be76:4eff:fe04:dc52]:8333
-[2001:4800:7819:104:be76:4eff:fe04:7809]:8333
+[2001:470:fab7:1::1]:8333
[2001:4800:7819:104:be76:4eff:fe05:c828]:8333
+[2001:4800:7819:104:be76:4eff:fe05:c9a0]:8333
+[2001:4801:7819:74:b745:b9d5:ff10:a61a]:8333
+[2001:4801:7819:74:b745:b9d5:ff10:aaec]:8333
+[2001:4801:7828:104:be76:4eff:fe10:1325]:8333
+[2001:4802:7800:1:be76:4eff:fe20:f023]:8333
[2001:4802:7800:2:30d7:1775:ff20:1858]:8333
+[2001:4802:7800:2:be76:4eff:fe20:6c26]:8333
[2001:4802:7802:101:be76:4eff:fe20:256]:8333
[2001:4802:7802:103:be76:4eff:fe20:2de8]:8333
[2001:4830:1100:2e8::2]:8333
-[2001:4ba0:fff7:181:dead::1]:8333
+[2001:4b98:dc2:41:216:3eff:fe56:f659]:8333
[2001:4ba0:fffa:5d::93]:8333
-[2001:4ba0:ffff:1be:1:1005:0:1]:8335
-[2001:4c48:110:101:216:3eff:fe24:1162]:8333
-[2001:4dd0:f101::32]:8333
+[2001:4ba0:ffff:1be:1:1005:0:1]:8333
[2001:4dd0:ff00:867f::3]:8333
[2001:4dd0:ff00:9a67::9]:8333
-[2001:4dd0:ff00:9c55:c23f:d5ff:fe6c:7ee9]:8333
[2001:5c0:1400:b::3cc7]:8333
-[2001:5c0:1400:b::3d01]:8333
-[2001:5c0:1400:b::8df]:8333
-[2001:5c0:1501:300::3]:8333
[2001:610:1b19::3]:8333
-[2001:620:500:fff0:f21f:afff:fecf:91cc]:8333
-[2001:67c:1220:80c:ad:8de2:f7e2:c784]:8333
-[2001:67c:21ec:1000::b]:8333
-[2001:6f8:1296:0:76d4:35ff:feba:1d26]:8333
-[2001:840:f000:4250:3e4a:92ff:fe6d:145f]:8333
+[2001:610:600:a41::2]:8333
+[2001:67c:26b4::]:8333
[2001:8d8:840:500::39:1ae]:8333
-[2001:980:efd8:0:21:de4a:2709:912]:8333
-[2001:981:46:1::3]:8333
-[2001:981:9319:2:c0:a8:c8:8]:8333
-[2001:9d8:cafe:3::91]:8333
-[2001:ad0:1:1:26be:5ff:fe25:959d]:8333
+[2001:8d8:965:4a00::10:9343]:8333
+[2001:980:4650:1:2e0:53ff:fe13:2449]:8333
+[2001:981:46:1:ba27:ebff:fe5b:edee]:8333
+[2001:9c8:53e9:369a:226:2dff:fe1b:7472]:8333
+[2001:9d8:cafe:3::87]:8333
+[2001:b10:11:21:3e07:54ff:fe48:7248]:8333
[2001:ba8:1f1:f34c::2]:8333
-[2001:bc8:381c:100::1]:8333
-[2002:175c:4caa::175c:4caa]:8333
-[2002:4404:82f1:0:8d55:8fbb:15fa:f4e0]:8333
-[2002:4475:2233:0:21f:5bff:fe33:9f70]:8333
-[2002:596c:48c3::596c:48c3]:8333
+[2001:bc8:2310:100::1]:8333
+[2001:bc8:3427:101:7a4f:8be:2611:6e79]:8333
+[2001:bc8:3505:200::1]:8333
+[2001:cc0:a004::30:1d]:8333
+[2001:e42:102:1209:153:121:76:171]:8333
+[2002:17ea:14eb::17ea:14eb]:8333
+[2002:2f8:2bc5::2f8:2bc5]:8333
+[2002:4047:482c::4047:482c]:8333
+[2002:45c3:8cca::45c3:8cca]:8333
+[2002:46bb:8a41:0:226:b0ff:feed:5f12]:8888
+[2002:46bb:8c3c:0:8d55:8fbb:15fa:f4e0]:8765
+[2002:4c48:a0fe::4c48:a0fe]:8333
+[2002:4d44:25c8::4d44:25c8]:8333
+[2002:505f:aaa2::505f:aaa2]:8333
+[2002:5bc1:799d::5bc1:799d]:8333
+[2002:6dec:5472::6dec:5472]:8333
[2002:8c6d:6521:9617:12bf:48ff:fed8:1724]:8333
-[2002:a646:5e6a::1:2]:8333
+[2002:ac52:94e2::ac52:94e2]:8333
+[2002:af7e:3eca::af7e:3eca]:8333
[2002:b009:20c5::b009:20c5]:8333
+[2002:c06f:39a0::c06f:39a0]:8333
+[2002:c23a:738a::c23a:738a]:8333
+[2002:c70f:7442::c70f:7442]:8333
+[2002:cec5:be4f::cec5:be4f]:8333
+[2002:d149:9e3a::d149:9e3a]:8333
+[2002:d917:ca5::d917:ca5]:8333
+[2400:8900::f03c:91ff:fe50:153f]:8333
[2400:8900::f03c:91ff:fe6e:823e]:8333
-[2400:8900::f03c:91ff:fe70:d164]:8333
-[2400:8901::f03c:91ff:fe37:9761]:8333
-[2403:4200:403:2::ff]:8333
-[2403:b800:1000:64:40a:e9ff:fe5f:94c1]:8333
-[2403:b800:1000:64:9879:17ff:fe6a:a59f]:8333
+[2400:8900::f03c:91ff:fea8:1934]:8333
+[2400:8901::f03c:91ff:fe26:c4d6]:8333
+[2400:8901::f03c:91ff:fec8:4280]:8333
+[2400:8901::f03c:91ff:fec8:660f]:8333
+[2401:1800:7800:102:be76:4eff:fe1c:559]:8333
+[2401:1800:7800:102:be76:4eff:fe1c:a7d]:8333
+[2405:aa00:2::40]:8333
[2600:3c00::f03c:91ff:fe18:59b2]:8333
-[2600:3c00::f03c:91ff:fe37:a4b1]:8333
-[2600:3c00::f03c:91ff:fe56:2973]:8333
+[2600:3c00::f03c:91ff:fe26:bfb6]:8333
+[2600:3c00::f03c:91ff:fe33:88e3]:8333
[2600:3c00::f03c:91ff:fe6e:7297]:8333
[2600:3c00::f03c:91ff:fe84:8a6e]:8333
[2600:3c01::f03c:91ff:fe18:6adf]:8333
-[2600:3c01::f03c:91ff:fe18:e217]:8333
-[2600:3c01::f03c:91ff:fe33:1b31]:8333
-[2600:3c01::f03c:91ff:fe33:2fe1]:8333
-[2600:3c01::f03c:91ff:fe33:a03f]:8333
+[2600:3c01::f03c:91ff:fe26:c4b8]:8333
+[2600:3c01::f03c:91ff:fe3b:1f76]:8333
[2600:3c01::f03c:91ff:fe50:5e06]:8333
-[2600:3c01::f03c:91ff:fe56:d645]:8333
-[2600:3c01::f03c:91ff:fe6e:a3dc]:8333
-[2600:3c01::f03c:91ff:fe89:a659]:8333
-[2600:3c02::f03c:91ff:fe6e:6f0b]:8333
-[2600:3c03::f03c:91ff:fe33:f6fb]:8333
+[2600:3c01::f03c:91ff:fe61:289b]:8333
+[2600:3c01::f03c:91ff:fe69:89e9]:8333
+[2600:3c01::f03c:91ff:fe84:ac15]:8333
+[2600:3c01::f03c:91ff:fe98:68bb]:8333
+[2600:3c02::f03c:91ff:fe26:713]:8333
+[2600:3c02::f03c:91ff:fe26:c49e]:8333
+[2600:3c02::f03c:91ff:fe84:97d8]:8333
+[2600:3c02::f03c:91ff:fec8:8feb]:8333
+[2600:3c03::f03c:91ff:fe18:da80]:8333
+[2600:3c03::f03c:91ff:fe26:c49b]:8333
[2600:3c03::f03c:91ff:fe50:5fa7]:8333
+[2600:3c03::f03c:91ff:fe67:d2e]:8333
[2600:3c03::f03c:91ff:fe6e:1803]:8333
-[2600:3c03::f03c:91ff:fe6e:4ac0]:8333
-[2601:6:4800:47f:1e4e:1f4d:332c:3bf6]:8333
-[2601:d:5400:fed:8d54:c1e8:7ed7:d45e]:8333
-[2602:100:4b8f:6d2a:20c:29ff:feaf:c4c2]:8333
+[2600:3c03::f03c:91ff:fec8:4bbe]:8333
+[2600:3c03::f03c:91ff:fee4:4e16]:8333
+[2601:18d:8300:58a6::2e4]:8333
+[2601:240:4600:40c0:250:56ff:fea4:6305]:8333
+[2601:581:c200:a719:542c:9cd5:4852:f7d9]:8333
+[2601:647:4900:85f1:ca2a:14ff:fe51:bb35]:8333
+[2601:c2:c002:b300:54a0:15b5:19f7:530d]:8333
+[2602:306:ccff:ad7f:b116:52be:64ba:db3a]:8333
+[2602:ae:1982:9400:846:f78c:fec:4d57]:8333
[2602:ffc5:1f::1f:2d61]:8333
[2602:ffc5:1f::1f:9211]:8333
+[2602:ffc5::75d5:c1c3]:8333
[2602:ffc5::ffc5:b844]:8333
[2602:ffe8:100:2::457:936b]:8333
-[2602:ffea:1001:125::2ad4]:8333
-[2602:ffea:1001:6ff::837d]:8333
+[2602:ffe8:100:2::9d20:2e3c]:8333
[2602:ffea:1001:72b::578b]:8333
-[2602:ffea:1001:77a::9cae]:8333
-[2602:ffea:1:2fe::6bc8]:8333
-[2602:ffea:1:701::7968]:8333
-[2602:ffea:1:70d::82ec]:8333
-[2602:ffea:1:9ff::e957]:8333
-[2602:ffea:1:a5d::4acb]:8333
[2602:ffea:a::24c4:d9fd]:8333
-[2602:ffea:a::c06:ae32]:8333
[2604:0:c1:100:1ec1:deff:fe54:2235]:8333
[2604:180:1:1af::42a9]:8333
-[2604:180::b208:398]:8333
-[2604:2880::6072:aed]:8333
+[2604:180:3:702::c9de]:8333
[2604:4080:1114:0:3285:a9ff:fe93:850c]:8333
-[2604:7c00:17:3d0::5a4d]:8333
-[2604:9a00:2100:a009:2::]:8333
-[2604:a880:1:20::22a:4001]:8333
-[2604:a880:800:10::752:f001]:8333
-[2604:c00:88:32:216:3eff:fee4:fcca]:8333
-[2604:c00:88:32:216:3eff:fef5:bc21]:8333
-[2605:7980:1:2::1761:3d4e]:8333
-[2605:e000:1417:4068:223:32ff:fe96:e2d]:8333
+[2604:6000:ffc0:3c:64a3:94d0:4f1d:1da8]:8333
+[2605:6000:f380:9a01:ba09:8aff:fed4:3511]:8333
+[2605:6001:e00f:7b00:c587:6d91:6eff:eeba]:8333
+[2605:f700:c0:1::25c3:2a3e]:8333
[2606:6000:a441:9903:5054:ff:fe78:66ff]:8333
-[2606:df00:2::ae85:8fc6]:8333
-[2607:5300:100:200::e7f]:8333
+[2607:5300:100:200::1c83]:9334
[2607:5300:10::a1]:8333
-[2607:5300:60:116e::1]:8333
-[2607:5300:60:1535::]:8333
-[2607:5300:60:1b32::1]:8333
-[2607:5300:60:2337::1]:8333
+[2607:5300:60:1c2f::1]:8333
[2607:5300:60:2b90::1]:8333
-[2607:5300:60:2d99::1]:8333
-[2607:5300:60:3cb::1]:8333
+[2607:5300:60:3320::1]:8333
+[2607:5300:60:385::1]:8333
[2607:5300:60:4a85::]:8333
-[2607:5300:60:5112:0:2:4af5:63fe]:8333
-[2607:5300:60:6dd5::]:8333
-[2607:5300:60:a91::1]:8333
-[2607:f1c0:820:1500::7f:3f44]:8333
+[2607:5300:60:65e4::]:8333
+[2607:5300:60:6918::]:8333
+[2607:5300:60:711a:78::a7b5]:8333
+[2607:5300:60:714::1]:8333
+[2607:5300:60:870::1]:8333
+[2607:5300:60:952e:3733::1414]:8333
[2607:f1c0:848:1000::48:943c]:8333
+[2607:f2e0:f:5df::2]:8333
+[2607:f748:1200:f8:21e:67ff:fe99:8f07]:8333
[2607:f948:0:1::7]:8333
-[2607:fcd0:100:2300::4ad:e594]:8333
-[2607:fcd0:100:2300::659e:9cb3]:8333
-[2607:fcd0:100:2300::c74b:a8ae]:8333
-[2607:fcd0:100:2300::d82:d8c2]:8333
-[2607:fcd0:100:4300::8795:2fa8]:8333
-[2607:fcd0:daaa:901::9561:e043]:8333
+[2607:ff68:100:36::131]:8333
+[2803:6900:1::117]:8333
+[2a00:1098:0:80:1000:25:0:1]:8333
+[2a00:1178:2:43:5054:ff:fe84:f86f]:8333
[2a00:1178:2:43:5054:ff:fee7:2eb6]:8333
-[2a00:1328:e100:cc42:230:48ff:fe92:55d]:8333
+[2a00:1178:2:43:8983:cc27:d72:d97a]:8333
+[2a00:1328:e100:cc42:230:48ff:fe92:55c]:8333
[2a00:14f0:e000:80d2:cd1a::1]:8333
-[2a00:16d8:c::5b6a:c261]:8333
-[2a00:61e0:4083:6d01:6852:1376:e972:2091]:8333
-[2a00:c98:2030:a02f:2::2]:8333
+[2a00:1630:2:1802:188:122:91:11]:8333
+[2a00:18e0:0:1800::1]:8333
+[2a00:18e0:0:dcc5:109:234:106:191]:8333
+[2a00:1a28:1157:87::94c7]:8333
+[2a00:1ca8:37::a5fc:40d1]:8333
+[2a00:1ca8:37::ab6d:ce2c]:8333
+[2a00:7143:100:0:216:3eff:fe2e:74a3]:8333
+[2a00:7143:100:0:216:3eff:fed3:5c21]:8333
+[2a00:7c80:0:45::123]:8333
+[2a00:dcc0:eda:98:183:193:c382:6bdb]:8333
+[2a00:dcc0:eda:98:183:193:f72e:d943]:8333
+[2a00:f820:17::4af:1]:8333
+[2a00:f940:2:1:2::101d]:8333
+[2a00:f940:2:1:2::6ac]:8333
[2a01:1b0:7999:402::131]:8333
-[2a01:1e8:e100:811c:700f:65f0:f72a:1084]:8333
-[2a01:238:42da:c500:6546:1293:5422:ab40]:8333
-[2a01:348:6:473::2]:8333
-[2a01:368:e010:2::2]:8333
-[2a01:430:17:1::ffff:549]:8333
-[2a01:430:17:1::ffff:830]:8333
-[2a01:488:66:1000:53a9:d04:0:1]:8333
-[2a01:488:66:1000:57e6:578c:0:1]:8333
+[2a01:238:42dd:f900:7a6c:2bc6:4041:c43]:8333
+[2a01:238:4313:6300:2189:1c97:696b:5ea]:8333
+[2a01:488:66:1000:5c33:91f9:0:1]:8333
[2a01:488:66:1000:b01c:178d:0:1]:8333
-[2a01:488:67:1000:523:fdce:0:1]:8333
-[2a01:488:67:1000:b01c:30ab:0:1]:8333
-[2a01:4f8:100:24aa::2]:8333
+[2a01:4f8:100:34ce::2]:8333
+[2a01:4f8:100:34e4::2]:8333
[2a01:4f8:100:44e7::2]:8333
+[2a01:4f8:100:510e::2]:8333
[2a01:4f8:100:5128::2]:8333
-[2a01:4f8:100:84a7::1:1]:8333
+[2a01:4f8:110:5105::2]:8333
[2a01:4f8:110:516c::2]:8333
-[2a01:4f8:110:536e::2]:8333
+[2a01:4f8:120:43e4::2]:8333
[2a01:4f8:120:62e6::2]:8333
[2a01:4f8:120:702e::2]:8333
-[2a01:4f8:120:8005::2]:8333
[2a01:4f8:120:8203::2]:8333
-[2a01:4f8:120:8422::2]:8333
-[2a01:4f8:121:11eb::2]:8333
+[2a01:4f8:121:234d::2]:8333
[2a01:4f8:121:261::2]:8333
-[2a01:4f8:130:242b::10]:8333
-[2a01:4f8:130:242b::5]:8333
-[2a01:4f8:130:2468::3]:8333
+[2a01:4f8:130:11ea::2]:8333
+[2a01:4f8:130:3332::2]:8333
+[2a01:4f8:130:40ab::2]:8333
[2a01:4f8:130:632c::2]:8333
[2a01:4f8:130:6366::2]:8333
-[2a01:4f8:130:6426::2]:8333
[2a01:4f8:130:934f::2]:8333
-[2a01:4f8:131:2070::2]:8333
-[2a01:4f8:131:54a2::2]:8333
-[2a01:4f8:140:80ad::2]:8333
+[2a01:4f8:131:33ad:fea1::666]:8333
+[2a01:4f8:140:2195::2]:8333
+[2a01:4f8:140:6333::2]:8333
+[2a01:4f8:140:930d::2]:8333
+[2a01:4f8:140:93b0::2]:8333
+[2a01:4f8:141:1167::2]:8333
[2a01:4f8:141:186::2]:8333
-[2a01:4f8:150:210b::2]:8333
-[2a01:4f8:150:2263::5]:8333
-[2a01:4f8:150:2349::2]:8333
-[2a01:4f8:150:61ee::2]:8333
-[2a01:4f8:150:7088:5054:ff:fe45:bff2]:8333
+[2a01:4f8:141:53f0::2]:8333
+[2a01:4f8:150:336a::2]:8333
+[2a01:4f8:150:72ee::4202]:8333
[2a01:4f8:150:8324::2]:9001
-[2a01:4f8:151:1d8::2]:8333
+[2a01:4f8:151:21ca::2]:8333
+[2a01:4f8:151:41c2:0:5404:a67e:f250]:8333
[2a01:4f8:151:5128::2]:8333
+[2a01:4f8:151:52c6::154]:8333
[2a01:4f8:151:6347::2]:9001
-[2a01:4f8:161:526d::2]:8333
-[2a01:4f8:161:9349::2]:8333
-[2a01:4f8:162:23c6::2]:8333
-[2a01:4f8:162:4348::2]:8333
-[2a01:4f8:162:7345::2]:8333
-[2a01:4f8:162:7383::2]:8333
-[2a01:4f8:162:74e3::2]:8333
-[2a01:4f8:190:6065::2]:8333
-[2a01:4f8:190:6349::2]:8333
+[2a01:4f8:160:5136::2]:8333
+[2a01:4f8:160:72c5::2858:e1c5]:8333
+[2a01:4f8:160:72c5::593b:60d5]:8333
+[2a01:4f8:160:814f::2]:8333
+[2a01:4f8:161:13d0::2]:8333
+[2a01:4f8:161:228f::2]:8333
+[2a01:4f8:161:51c4::2]:8333
+[2a01:4f8:161:60a7::2]:8333
+[2a01:4f8:161:7026::2]:8333
+[2a01:4f8:161:9184::2]:8333
+[2a01:4f8:162:2108::2]:8333
+[2a01:4f8:162:218c::2]:8333
+[2a01:4f8:162:4443::2]:8333
+[2a01:4f8:162:51a3::2]:8333
+[2a01:4f8:171:b93::2]:8333
+[2a01:4f8:190:1483::1]:8333
+[2a01:4f8:190:4495::2]:8333
[2a01:4f8:190:64c9::2]:8333
[2a01:4f8:190:91ce::2]:8333
[2a01:4f8:191:2194::83]:8333
-[2a01:4f8:191:40a1::2]:8333
-[2a01:4f8:191:4a7::2]:8333
-[2a01:4f8:191:63b4:5000::1]:8333
-[2a01:4f8:191:7121::2]:8333
+[2a01:4f8:191:40e8::2]:8333
+[2a01:4f8:191:44b4::2]:8333
+[2a01:4f8:191:8242::2]:8333
[2a01:4f8:191:83a2::2]:8333
-[2a01:4f8:191:93c4::2]:8333
-[2a01:4f8:192:60a9:0:1:5:2]:8333
-[2a01:4f8:192:73b2::2]:8333
-[2a01:4f8:192:8098::2]:8333
+[2a01:4f8:192:11b2::2]:8333
+[2a01:4f8:192:216c::2]:8333
+[2a01:4f8:192:22b3::2]:8333
+[2a01:4f8:192:440b::2]:8333
[2a01:4f8:192:db::2]:8333
[2a01:4f8:200:1012::2]:8333
-[2a01:4f8:200:22e3::2]:8333
-[2a01:4f8:200:414e::2]:8333
-[2a01:4f8:200:63af::222]:8333
+[2a01:4f8:200:23d1::dead:beef]:8333
+[2a01:4f8:200:506d::2]:8333
+[2a01:4f8:200:51f0::2]:8333
+[2a01:4f8:200:5389::2]:8333
+[2a01:4f8:200:53e3::2]:8333
+[2a01:4f8:200:6344::2]:8333
+[2a01:4f8:200:6396::2]:8333
+[2a01:4f8:200:63af::119]:8333
[2a01:4f8:200:71e3:78b4:f3ff:fead:e8cf]:8333
-[2a01:4f8:201:5164::2]:8333
+[2a01:4f8:201:214c::2]:8333
+[2a01:4f8:201:233:1::3]:8333
+[2a01:4f8:201:3e3::2]:8333
[2a01:4f8:201:6011::4]:8333
[2a01:4f8:201:60d5::2]:8333
+[2a01:4f8:202:265::2]:8333
+[2a01:4f8:202:3115::2]:8333
+[2a01:4f8:202:31e3::2]:8333
+[2a01:4f8:202:31ef::2]:8333
+[2a01:4f8:202:3392::2]:8333
[2a01:4f8:202:53c3::2]:8333
+[2a01:4f8:202:63f4::2]:8333
+[2a01:4f8:202:7227::2]:8333
+[2a01:4f8:210:2227::2]:8333
[2a01:4f8:210:24aa::2]:8333
-[2a01:4f8:210:502f::2]:8333
[2a01:4f8:211:14cf::2]:8333
-[2a01:4f8:211:1a59::2]:8333
-[2a01:4f8:211:2ac1::2]:8333
-[2a01:4f8:211:cca::2]:8333
-[2a01:4f8:a0:22a5::2]:8333
-[2a01:4f8:a0:5023::2]:8333
+[2a01:4f8:211:181b::2]:8333
+[2a01:4f8:212:289e::2]:8333
+[2a01:4f8:212:33db::2]:18333
+[2a01:4f8:a0:112f::2]:8333
+[2a01:4f8:a0:3174::2]:8333
+[2a01:4f8:a0:328c::2]:8333
[2a01:4f8:a0:5243::2]:8333
-[2a01:4f8:a0:74c8::2]:8333
-[2a01:4f8:a0:8227::2]:8333
-[2a01:4f8:a0:822d::2]:8333
-[2a01:4f8:d13:2183::2]:8333
+[2a01:4f8:c17:19b9::2]:8333
+[2a01:4f8:c17:1a41::2]:8333
+[2a01:4f8:c17:1a92::2]:8333
+[2a01:4f8:c17:273::2]:8333
+[2a01:4f8:c17:435::2]:8333
+[2a01:4f8:c17:755::2]:8333
+[2a01:4f8:c17:b54::2]:8333
+[2a01:4f8:d16:9384::2]:8333
[2a01:608:ffff:a009:8bf5:879d:e51a:f837]:8333
-[2a01:79d:469e:ed94:c23f:d5ff:fe65:20c5]:8333
-[2a01:7c8:aab5:3e6:5054:ff:fed7:4e54]:8333
+[2a01:680:10:10:f2de:f1ff:fec9:dc0]:8333
+[2a01:7c8:aaac:1f6:5054:ff:fe30:e585]:8333
+[2a01:7c8:aaac:20b:5054:ff:fe24:435e]:8333
+[2a01:7c8:aaac:43d:5054:ff:fe4e:3dd4]:8333
+[2a01:7c8:aaad:256::1]:8333
+[2a01:7c8:aab6:ea:5054:ff:feff:eac3]:8333
+[2a01:7c8:aab9:5a:5054:ff:fe89:7b26]:8333
+[2a01:7c8:aabc:2c8:5054:ff:fe35:6581]:8333
[2a01:7e00::f03c:91ff:fe18:301e]:8333
-[2a01:7e00::f03c:91ff:fe18:7749]:8333
-[2a01:7e00::f03c:91ff:fe33:2d67]:8333
-[2a01:7e00::f03c:91ff:fe33:347c]:8333
-[2a01:7e00::f03c:91ff:fe33:ae50]:8333
-[2a01:7e00::f03c:91ff:fe56:6b5c]:8333
-[2a01:7e00::f03c:91ff:fe56:bee6]:8333
-[2a01:7e00::f03c:91ff:fe69:4895]:8333
-[2a01:7e00::f03c:91ff:fe69:9912]:8333
-[2a01:7e00::f03c:91ff:fe6e:26ee]:8333
-[2a01:7e00::f03c:91ff:fe73:42f1]:8333
+[2a01:7e00::f03c:91ff:fe18:3942]:8333
+[2a01:7e00::f03c:91ff:fe26:8c87]:8333
+[2a01:7e00::f03c:91ff:fe50:6206]:8333
+[2a01:7e00::f03c:91ff:fe67:559d]:8333
[2a01:7e00::f03c:91ff:fe84:434f]:8333
-[2a01:7e00::f03c:91ff:fe84:b36b]:8333
-[2a01:7e00::f03c:91ff:fe89:1faa]:8333
-[2a01:7e00::f03c:91ff:fe98:816]:8333
+[2a01:7e00::f03c:91ff:fe89:1143]:8333
+[2a01:7e00::f03c:91ff:fe98:2505]:8333
[2a01:7e00::f03c:91ff:fedb:352e]:8333
-[2a01:7e00::f03c:91ff:fedb:4a1d]:8333
-[2a01:e34:edbb:6750:224:1dff:fe89:3897]:8333
-[2a01:e35:2f1d:3fb0:7187:c7ba:bcfc:80ce]:8333
-[2a01:e35:8787:96f0:9032:9297:39ae:496d]:8333
+[2a01:7e01::f03c:91ff:fec8:d7b5]:8333
+[2a01:e34:ee33:1640:c504:f677:b28a:ba42]:8333
+[2a01:e35:2e7e:bc0:e079:f55e:cef3:b5d7]:8333
+[2a01:e35:2ee5:610:21f:d0ff:fe4e:7460]:8333
[2a01:e35:8a3f:47c0:c617:feff:fe3c:9fbd]:8333
-[2a01:e35:8b66:6a0:4900:9dfd:d841:d025]:8333
-[2a02:168:4a01::39]:8333
-[2a02:168:5404:2:c23f:d5ff:fe6a:512e]:8333
-[2a02:180:1:1::5b8f:538c]:8333
-[2a02:2028:1016::2]:8333
-[2a02:2528:503:2::14]:8333
+[2a01:e35:8aca:6a0:211:aff:fe5e:295e]:8333
+[2a02:180:a:18:81:7:11:50]:8333
+[2a02:1810:1d87:6a00:5604:a6ff:fe60:d87d]:8333
+[2a02:2168:1144:5c01:d63d:7eff:fedd:4f8e]:8333
+[2a02:2498:6d7b:7001:b508:b39d:2cea:5b7a]:8333
[2a02:2528:503:2::15]:8333
-[2a02:2528:ff00:81a6:21e:c5ff:fe8d:f9a5]:8333
-[2a02:2770:5:0:21a:4aff:fee4:c7db]:8333
-[2a02:2770:8:0:21a:4aff:fe7b:3dcd]:8333
-[2a02:348:5e:5a29::1]:8333
-[2a02:7aa0:1619::202f:c06a]:8333
-[2a02:8109:8e40:35fc:ba27:ebff:feae:cf16]:8333
-[2a02:af8:6:1500::1:130]:8333
-[2a02:c200:0:10:1:0:6314:2222]:8333
-[2a02:c200:0:10:2:3:3295:1]:8332
-[2a02:c200:0:10:3:0:5449:1]:8333
-[2a02:c200:1:10:2:3:5899:1]:8333
-[2a02:c200:1:10::2705:1]:8333
-[2a02:ce80:0:20::1]:8333
-[2a02:fe0:c321:27e0:6ef0:49ff:fe11:a61d]:8333
+[2a02:2528:fa:1a56:216:44ff:fe6a:d112]:8333
+[2a02:27f8:2012:0:e9f7:268f:c441:6129]:8333
+[2a02:348:86:3011::1]:8333
+[2a02:4780:1:1::1:8a01]:8333
+[2a02:578:5002:116::2]:8333
+[2a02:6080::1:190b:69e3]:8333
+[2a02:6080::1:e893:d9d6]:8333
+[2a02:770:4000::139]:8333
+[2a02:7aa0:1201::deb3:81a2]:8333
+[2a02:8010:b001::5860:59b5]:8333
+[2a02:810d:21c0:f00:a248:1cff:feb8:5348]:8333
+[2a02:a50::21b:24ff:fe93:4e39]:8333
+[2a02:a80:0:1200::2]:8333
+[2a02:c200:0:10:2:1:5830:1]:8333
+[2a02:c200:0:10:2:5:4692:1]:8333
+[2a02:c200:0:10:3:0:7158:1]:8333
+[2a02:c200:0:10::2244:1]:8333
+[2a02:c200:1:10:2:3:3339:1]:8333
+[2a02:c200:1:10:2:3:7844:1]:8333
+[2a02:c200:1:10:2:5:6288:1]:8333
+[2a02:c200:1:10:3:0:5912:1]:8333
[2a03:4000:2:496::8]:8333
-[2a03:b0c0:0:1010::62:f001]:8333
+[2a03:4000:6:8009::1]:8333
+[2a03:4000:6:8063::bcd0]:8333
+[2a03:4900:fffc:b::2]:8333
+[2a03:b0c0:1:d0::d:5001]:8333
+[2a03:f80:ed15:149:154:155:235:1]:8333
+[2a03:f80:ed15:149:154:155:241:1]:8333
[2a03:f80:ed16:ca7:ea75:b12d:2af:9e2a]:8333
+[2a04:1980:3100:1aab:290:faff:fe70:a3d8]:8333
+[2a04:1980:3100:1aab:e61d:2dff:fe29:f590]:8333
+[2a04:2f80:6:200::89]:8333
+[2a04:ac00:1:4a0b:5054:ff:fe00:5af5]:8333
+[2a04:ad80:0:68::35da]:8333
3ffk7iumtx3cegbi.onion:8333
-3hshaantu6ot4upz.onion:8333
-45c5lc77qgpikafy.onion:8333
+3nmbbakinewlgdln.onion:8333
+4j77gihpokxu2kj4.onion:8333
+546esc6botbjfbxb.onion:8333
+5at7sq5nm76xijkd.onion:8333
77mx2jsxaoyesz2p.onion:8333
7g7j54btiaxhtsiy.onion:8333
-b6fr7dlbu2kpiysf.onion:8333
-bitcoincfqcssig5.onion:8333
+a6obdgzn67l7exu3.onion:8333
+ab64h7olpl7qpxci.onion:8333
+am2a4rahltfuxz6l.onion:8333
+azuxls4ihrr2mep7.onion:8333
+bitcoin7bi4op7wb.onion:8333
bitcoinostk4e4re.onion:8333
+bk7yp6epnmcllq72.onion:8333
bmutjfrj5btseddb.onion:8333
-drp4pvejybx2ejdr.onion:8333
-gixnv56d63buypan.onion:8333
+ceeji4qpfs3ms3zc.onion:8333
+clexmzqio7yhdao4.onion:8333
+gb5ypqt63du3wfhn.onion:8333
h2vlpudzphzqxutd.onion:8333
-hhiv5pnxenvbf4am.onion:8333
-lzxpkn6ptp3ohh63.onion:8333
-msphsgfiqfq5stne.onion:8333
+n42h7r6oumcfsbrs.onion:4176
ncwk3lutemffcpc4.onion:8333
okdzjarwekbshnof.onion:8333
-sjdomi4yb2dwkjbc.onion:8333
-uvwozwxlihntigbb.onion:8333
-v6ylz45dn5ybpk4d.onion:8333
+pjghcivzkoersesd.onion:8333
+rw7ocjltix26mefn.onion:8333
+uws7itep7o3yinxo.onion:8333
vk3qjdehyy4dwcxw.onion:8333
vqpye2k5rcqvj5mq.onion:8333
-xudkoztdfrsuyyou.onion:8333
-z55v4ostefnwfy32.onion:8333
+wpi7rpvhnndl52ee.onion:8333