Merge branch 'master' into Development

This commit is contained in:
Manfred Karrer 2017-12-19 20:59:42 +01:00
commit 8637bc4cc8
No known key found for this signature in database
GPG key ID: 401250966A6B2C46

View file

@ -69,7 +69,7 @@ public class BitcoinNodes {
new BtcNode("bcwat.ch", "z33nukt7ngik3cpe.onion", "5.189.166.193", BtcNode.DEFAULT_PORT, "@sgeisler"),
// others
new BtcNode("btc.jochen-hoenicke.de", null, "37.221.198.57", BtcNode.DEFAULT_PORT, "@jhoenicke"), // requested onion
new BtcNode("btc.jochen-hoenicke.de", null, "88.198.39.205", BtcNode.DEFAULT_PORT, "@jhoenicke"), // requested onion
new BtcNode("bitcoin4-fullnode.csg.uzh.ch", null, "192.41.136.217", BtcNode.DEFAULT_PORT, "@tbocek") // requested onion
) :
new ArrayList<>();