Mike Rosseel ebe23a8c62 Merge remote-tracking branch 'upstream/Development' into netlayer ... Conflicts: network/pom.xml network/src/main/java/io/bisq/network/p2p/network/TorNetworkNode.java		2017-10-30 12:59:57 +01:00
..
src	Fix #559, misaligned trade data	2017-10-29 10:50:46 +01:00
pom.xml	Integrate 0.3.1 version of netlayer, still not working.	2017-10-27 15:00:15 +02:00