Changeset 29a3db4


Ignore:
Timestamp:
Oct 7, 2009 3:00:17 PM (11 years ago)
Author:
dev <dev@…>
Branches:
master
Children:
7dd8f00
Parents:
5d95907 (diff), 9b97d32 (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 '10cb3e6e3bbb0dac3121e53e10232efe27200229'

and 'd5b1ef74ebfbd8e8c1cd1d51c74e6ec542940ca3'

Files:
7 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

    r5d95907 r29a3db4  
    335335    }
    336336   
     337    /** @param ot non-null */
    337338    public void setOpenTrackerString(String ot) {
    338339        _opts.put(PROP_OPENTRACKERS, ot);
  • apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

    r5d95907 r29a3db4  
    195195        _util.setMaxUploaders(getInt(PROP_UPLOADERS_TOTAL, Snark.MAX_TOTAL_UPLOADERS));
    196196        _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW));
    197         _util.setOpenTrackerString(_config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS));
     197        String ot = _config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS);
     198        if (ot != null)
     199            _util.setOpenTrackerString(ot);
    198200        getDataDir().mkdirs();
    199201    }
  • history.txt

    r5d95907 r29a3db4  
     12009-10-04 zzz
     2    * i2psnark: Fix NPE caused by last checkin (thanks wuxia!)
     3
    142009-10-02 zzz
    25    * BuildMessageTest: Move out of the lib
  • hosts.txt

    r5d95907 r29a3db4  
    318318bob.i2p=5uAI6ENnNP8acDkAtYqBjLa-gFqM~uERNZdJBKtRwUvDkuXvIM66pYfYL3-ugTmoR-SIveDl4u3~soprUO2EYErMzroAmd9pfl0L2vYBWFUQfImkiqFhiGebMzy2zT-~00p5mzHtbg59MCvD1TwsFxU3M0Ftig~ErN0ezFYQ9DKOfOTN-As2QBXZo5vhhzpvrUNuG~MLa2aw7ubImX45EQYqmkmIf5bHCM4skSww24fBrVuMgM3lI6hYjcI65K4-U2t65QOM9RseHW3X4qZ3g8SBzC-4YWWxJH4G0Clp4nA0s9wUqyQHEfUKfJUipjH5OiX46UfNJGU6ccgJnl6zmW6QaW~ppzoHtF7Lp19ZLxrmTglm~GN41NXGkMIj-xSFmF3wz-kwfm-6VhcDaYe8Td1hghGxHPqFJVyC66oSwTB7oP9XO7HuBACr-9O2TmrJbYSw6FCtQkgWctqRffJVB0Ecq7qeCbsMliBe1xLsWVV1dcDnYzzGvNxo3RakoqamAAAA
    319319sponge.i2p=VG4Bd~q1RA3BdoF3z5fSR7p0xe1CTVgDMWVGyFchA9Wm2iXUkIR35G45XE31Uc9~IOt-ktNLL2~TYQZ13Vl8udosngDn8RJG1NtVASH4khsbgkkoFLWd6UuvuOjQKBFKjaEPJgxOzh0kxolRPPNHhFuuAGzNLKvz~LI2MTf0P6nwmRg1lBoRIUpSVocEHY4X306nT2VtY07FixbJcPCU~EeRin24yNoiZop-C3Wi1SGwJJK-NS7mnkNzd8ngDJXDJtR-wLP1vNyyBY6NySgqPiIhENHoVeXd5krlR42HORCxEDb4jhoqlbyJq-PrhTJ5HdH4-~gEq09B~~NIHzy7X02XgmBXhTYRtl6HbLMXs6SI5fq9OFgVp5YZWYUklJjMDI7jOrGrEZGSHhnJK9kT6D3CqVIM0cYEhe4ttmTegbZvC~J6DrRTIAX422qRQJBPsTUnv4iFyuJE-8SodP6ikTjRH21Qx73SxqOvmrOiu7Bsp0lvVDa84aoaYLdiGv87AAAA
     320docs.i2p2.i2p=BhSHFwXW7zGTLRVTRuTfgxWC1PxKGDyY2OYpS0IrDnYhQklWVFxHz4xVpw8UXo8LTFXAnAjknrcYdLt6DfHcO-ZkFPo5UbOIfywSsHoet4J6BQ1MOt1MLTAejks4Rkj3~sfK2fJHHvHYTjm1v5~f8c13ZH5fPfQ3A71RRCyiYaeO5-VxC6rqvW~z0dNO~-jakjwD7tHtzQL2vQTqarYT859yUiHmLJ~yw5jXfxNBhlxIxaXg0Nat9S5N2W4Eqemy-UYtSGOM4IUGKoM902JxhVpz~O1~iB5H211E3x-o8dKTt9Yz2G5Qcp1kRB0NCO2Noivsxjnfv~64zoUVbPepyJFQKenRtX844HgOESNcUp~FoVzI~QJne5irJDMLK1dNsua3L1kz0MA-2Aev8byWe4TIXeZCuDpYi4bRK6OPKDETwJG8edw7CFtsQaFI-2wGMFu8GDH7pUL8~1qyDjjFv5c~q1MFhty9q8LRUGHHgWP47u9n8OX4zcS4P1~5z2M3AAAA
     321paste.i2p2.i2p=PbHXL5PXan7siJiFcUAV~VC0JCLxgnoOnZFjyvJ0dbYlQ3fi1K6SD961pjQ51OSeTnbe5iGRzbY2X0~pG4k~hexau4NizxprAdgdiC-4J3-xpVRjZ4IxuMoDXp-V8Nhv8pLCQcxiEXbWft2v7zLvkp2y6uqH7kab8FXL~z568rMMH0DDs8imwAawasyGtLLo77X8n-C0K~7orcWDVZicWABJ-zky1Zlllx~Y~S8RHWyN4dueP6wkH484b81xNbbt3P-HzE3TcKAvUcSV1Bq4J5UNafQYU7DhV7roUtw4HuJYoxiXnlXVeC-uTCGF~bPrjrB-~Yn0KyObmXs5yvAcKHIS2tgmlsP9nahyn1ZOrlZc0L3DEsv4rkfQyzHVBxcCzMUOchWehE09GLy3bviWZ43lB7kU8kRaja7G4xLrD-CXNXq6q7WNYXrqX7EmtsvCo8VDcFn2ODyLb3eyDe~CkO7ES7mv3u8jJxJRQEcjj71pvu7bMzSMh-xN08X6vx9AAAAA
  • readme.html

    r5d95907 r29a3db4  
    3333      <li><a href="http://echelon.i2p">echelon.i2p</a>: software
    3434        archive and information for I2P</li>
     35      <li><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: secure and
     36        anonymous paste service.</li>
    3537    </ul></ul><ul>
    3638      There are many more eepsites - just follow the links from the ones you see,
  • readme_de.html

    r5d95907 r29a3db4  
    1717         <li class="tidylist"><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: Freenet proxy</li>
    1818         <li class="tidylist"><a href="http://echelon.i2p">echelon.i2p</a>: Software Archive und Informationen zu I2P</li>
     19         <li class="tidylist"><a href="http://paste.i2p2.i2p">paste.i2p2.i2p</a>: Anonymer Pastebin</li>
    1920        </ul><br />
    2021     Es gibt viel mehr Eepsites - folge einfach den Links die du findest,
  • router/java/src/net/i2p/router/RouterVersion.java

    r5d95907 r29a3db4  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 21;
     21    public final static long BUILD = 22;
    2222    /** for example "-test" */
    2323    public final static String EXTRA = "-rc";
Note: See TracChangeset for help on using the changeset viewer.