Merge branch 'develop'

Conflicts:
	build.gradle

README.md

@@ -8,4 +8,17 @@ Please note that development is still heavily in progress, and I will break the
 Security
 --------
 
-If you're able to audit Jabit to verify its security, you would be very very welcome. Please be aware though that the official Bitmessage project would like an audit, too, and they were first in line.
+There are most probably some security issues, me programming this thing all by myself. Jabit doesn't do anything against timing attacks yet, for example. Please feel free to use the library, report bugs and maybe even help out. I hope the code is easy to understand and work with.
+
+Project Status
+--------------
+Basically, everything needed for a working Bitmessage client is there:
+* Creating new identities (private addresses)
+* Adding contracts and subscriptions
+* Receiving broadcasts
+* Receiving messages
+* Sending messages and broadcasts
+* Managing outgoing and incoming connections
+* Initialise and manage a registry of Bitmessage network nodes
+* An easy to use API
+* A command line demo application built using the API

build.gradle

@@ -5,7 +5,7 @@ allprojects {
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'
-    version = '0.1.1'
+    version = '0.1.2'
 
     repositories {
         mavenCentral()

domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java

@@ -157,6 +157,8 @@ public class NetworkAddress implements Streamable {
                 this.ipv6 = addr;
             } else if (addr.length == 4) {
                 this.ipv6 = new byte[16];
+                this.ipv6[10] = (byte) 0xff;
+                this.ipv6[11] = (byte) 0xff;
                 System.arraycopy(addr, 0, this.ipv6, 12, 4);
             } else {
                 throw new IllegalArgumentException("Weird address " + inetAddress);