Changeset f00ac6a for router


Ignore:
Timestamp:
Apr 10, 2018 2:30:00 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
a474bd4
Parents:
5bef86f (diff), c030852 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '13e60de3d602be3958686f91b450707dda0767b9'

and '7d04d994f5d52eb6e483ee8654f9314ec9997387'

Location:
router/java/src/net/i2p/router
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/RouterVersion.java

    r5bef86f rf00ac6a  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 26;
     21    public final static long BUILD = 0;
    2222
    2323    /** for example "-test" */
    24     public final static String EXTRA = "-rc";
     24    public final static String EXTRA = "";
    2525    public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
    2626    public static void main(String args[]) {
  • router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java

    r5bef86f rf00ac6a  
    7676                name = DataHelper.stripHTML(name);
    7777            else
    78                 name = _settings.getDestination().toBase32() + ".b32.i2p";
     78                name = _settings.getDestination().toBase32();
    7979        }
    8080        _rateName = "tunnel.Bps." + name +
Note: See TracChangeset for help on using the changeset viewer.