merge of '13e60de3d602be3958686f91b450707dda0767b9'

and '7d04d994f5d52eb6e483ee8654f9314ec9997387'
This commit is contained in:
zzz
2018-04-10 14:30:00 +00:00
12 changed files with 49 additions and 41 deletions

View File

@ -18,10 +18,10 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 26;
public final static long BUILD = 0;
/** for example "-test" */
public final static String EXTRA = "-rc";
public final static String EXTRA = "";
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
public static void main(String args[]) {
System.out.println("I2P Router version: " + FULL_VERSION);

View File

@ -75,7 +75,7 @@ public class TunnelPool {
if (name != null)
name = DataHelper.stripHTML(name);
else
name = _settings.getDestination().toBase32() + ".b32.i2p";
name = _settings.getDestination().toBase32();
}
_rateName = "tunnel.Bps." + name +
(_settings.isInbound() ? ".in" : ".out");