merge of 'ad0ab5020bb253c5233ac2f036c0cf4f40001d51'

     and 'bc7c0fa32e955a7d8185456815652d4baab500ae'

core/java/src/net/i2p/data/i2cp/SessionConfig.java

@@ -187,7 +187,6 @@ public class SessionConfig extends DataStructureImpl {
 
     public void readBytes(InputStream rawConfig) throws DataFormatException, IOException {
         _destination = Destination.create(rawConfig);
-        _destination.readBytes(rawConfig);
         _options = DataHelper.readProperties(rawConfig);
         _creationDate = DataHelper.readDate(rawConfig);
         _signature = new Signature();

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 2;
+    public final static long BUILD = 3;
 
     /** for example "-test" */
     public final static String EXTRA = "";