Changeset 7b711eb


Ignore:
Timestamp:
Jun 3, 2015 11:40:28 AM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d96ddd1
Parents:
07627152 (diff), 3c89bd4 (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:

propagate from branch 'i2p.i2p.zzz.test2' (head 47586aa88408845c51ee4c5fce40c617bdb8e398)

to branch 'i2p.i2p' (head bacb6048bc596f064ff237dd8569014a421b4ef6)

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

    r07627152 r7b711eb  
    4848    private int _tunnelDepth = -1;
    4949    private int _tunnelQuantity = -1;
    50     private int _tunnelVariance = -1;
     50    // -2 or higher is valid
     51    private int _tunnelVariance = -3;
    5152    private int _tunnelBackupQuantity = -1;
    5253    private boolean _connectDelay;
     
    802803            config.setProperty("option.outbound.length", Integer.toString(_tunnelDepth));
    803804        }
    804         if (_tunnelVariance >= 0) {
     805        if (_tunnelVariance >= -2) {
    805806            config.setProperty("option.inbound.lengthVariance", Integer.toString(_tunnelVariance));
    806807            config.setProperty("option.outbound.lengthVariance", Integer.toString(_tunnelVariance));
  • core/java/src/net/i2p/CoreVersion.java

    r07627152 r7b711eb  
    1919    public final static String ID = "Monotone";
    2020
    21     public final static String VERSION = "0.9.19";
     21    public final static String VERSION = "0.9.20";
    2222
    2323    /**
  • core/java/src/net/i2p/util/FortunaRandomSource.java

    r07627152 r7b711eb  
    263263    @Override
    264264    public void feedEntropy(String source, byte[] data, int offset, int len) {
    265         synchronized(_fortuna) {
    266             _fortuna.addRandomBytes(data, offset, len);
     265        try {
     266            synchronized(_fortuna) {
     267                _fortuna.addRandomBytes(data, offset, len);
     268            }
     269        } catch (Exception e) {
     270            // AIOOBE seen, root cause unknown, ticket #1576
     271            Log log = _context.logManager().getLog(FortunaRandomSource.class);
     272            log.warn("feedEntropy()", e);
    267273        }
    268274    }
  • history.txt

    r07627152 r7b711eb  
     1* 2015-06-02 0.9.20 released
     2
     32015-05-31 zzz
     4 * Fortuna: Catch AIOOBE (ticket #1576)
     5
     62015-05-30 zzz
     7 * i2ptunnel: Fix +/- variance config (ticket #1587)
     8
    192015-05-29 zzz
    210 * HTTP client: Fix occasional truncation of compressed responses
  • installer/install.xml

    r07627152 r7b711eb  
    55    <info>
    66        <appname>i2p</appname>
    7         <appversion>0.9.19</appversion>
     7        <appversion>0.9.20</appversion>
    88        <authors>
    99            <author name="I2P" email="https://geti2p.net/"/>
  • router/java/src/net/i2p/router/RouterVersion.java

    r07627152 r7b711eb  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 32;
     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[]) {
Note: See TracChangeset for help on using the changeset viewer.