From 3eae78795767b5d7ebc688f9bc87667c29a86bb3 Mon Sep 17 00:00:00 2001 From: dev Date: Sat, 3 Oct 2009 18:06:50 +0000 Subject: [PATCH 1/3] merge hosts.txt with i2p.www --- hosts.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts.txt b/hosts.txt index 731c9e1a5..4b0427a17 100644 --- a/hosts.txt +++ b/hosts.txt @@ -317,3 +317,5 @@ tracker2.postman.i2p=lnQ6yoBTxQuQU8EQ1FlF395ITIQF-HGJxUeFvzETLFnoczNjQvKDbtSB7aH nibble.i2p=V2XQ31BQWcwLcBNz2ywb4xy0Q1GMjdziQyjKql-lGdYPOX7w9g3j8IkA1jfW6YYwNi5QZc0JurjrSNH1yx6Y1goI8SB1l-yWdzst73fGWo6B1UtL45XrfXPg5k34RpktCNa4KoeIsUnGnxHQESSj5hw389hvexKXlkAHXQg9eUfbBYyzZc~~Kt4YdYX4cfMpXXjg443kyEiwKisOaRuiEN-YjqZ8pJTyAQsOKNg8hL3e15XFNPfAAkCSsALPAqj0~HZDwCZDeV0Cp4iaCGjw8tsNQ7xBeSjnhOeMoZKtrPAbbK4vNh7OIcakcVu16ykfEf-FcqbPQQe9rjilMy8V-BcjhggjUcZmtWj9qE7RMfUFpbAIfNHgWXTl5yR5V~brqxxuBxHQWn4oyB5NpY02dBkvvxXwdk~XFzXlSz~uEZKVswvI8rUHR4a2N3YDss5iQ~uscvKwNvsTZiDUaN66~CacZLYU9BtDBNnAxClz9LSu5b9CiunKeacbH6l5qrPpAAAA bob.i2p=5uAI6ENnNP8acDkAtYqBjLa-gFqM~uERNZdJBKtRwUvDkuXvIM66pYfYL3-ugTmoR-SIveDl4u3~soprUO2EYErMzroAmd9pfl0L2vYBWFUQfImkiqFhiGebMzy2zT-~00p5mzHtbg59MCvD1TwsFxU3M0Ftig~ErN0ezFYQ9DKOfOTN-As2QBXZo5vhhzpvrUNuG~MLa2aw7ubImX45EQYqmkmIf5bHCM4skSww24fBrVuMgM3lI6hYjcI65K4-U2t65QOM9RseHW3X4qZ3g8SBzC-4YWWxJH4G0Clp4nA0s9wUqyQHEfUKfJUipjH5OiX46UfNJGU6ccgJnl6zmW6QaW~ppzoHtF7Lp19ZLxrmTglm~GN41NXGkMIj-xSFmF3wz-kwfm-6VhcDaYe8Td1hghGxHPqFJVyC66oSwTB7oP9XO7HuBACr-9O2TmrJbYSw6FCtQkgWctqRffJVB0Ecq7qeCbsMliBe1xLsWVV1dcDnYzzGvNxo3RakoqamAAAA sponge.i2p=VG4Bd~q1RA3BdoF3z5fSR7p0xe1CTVgDMWVGyFchA9Wm2iXUkIR35G45XE31Uc9~IOt-ktNLL2~TYQZ13Vl8udosngDn8RJG1NtVASH4khsbgkkoFLWd6UuvuOjQKBFKjaEPJgxOzh0kxolRPPNHhFuuAGzNLKvz~LI2MTf0P6nwmRg1lBoRIUpSVocEHY4X306nT2VtY07FixbJcPCU~EeRin24yNoiZop-C3Wi1SGwJJK-NS7mnkNzd8ngDJXDJtR-wLP1vNyyBY6NySgqPiIhENHoVeXd5krlR42HORCxEDb4jhoqlbyJq-PrhTJ5HdH4-~gEq09B~~NIHzy7X02XgmBXhTYRtl6HbLMXs6SI5fq9OFgVp5YZWYUklJjMDI7jOrGrEZGSHhnJK9kT6D3CqVIM0cYEhe4ttmTegbZvC~J6DrRTIAX422qRQJBPsTUnv4iFyuJE-8SodP6ikTjRH21Qx73SxqOvmrOiu7Bsp0lvVDa84aoaYLdiGv87AAAA +docs.i2p2.i2p=BhSHFwXW7zGTLRVTRuTfgxWC1PxKGDyY2OYpS0IrDnYhQklWVFxHz4xVpw8UXo8LTFXAnAjknrcYdLt6DfHcO-ZkFPo5UbOIfywSsHoet4J6BQ1MOt1MLTAejks4Rkj3~sfK2fJHHvHYTjm1v5~f8c13ZH5fPfQ3A71RRCyiYaeO5-VxC6rqvW~z0dNO~-jakjwD7tHtzQL2vQTqarYT859yUiHmLJ~yw5jXfxNBhlxIxaXg0Nat9S5N2W4Eqemy-UYtSGOM4IUGKoM902JxhVpz~O1~iB5H211E3x-o8dKTt9Yz2G5Qcp1kRB0NCO2Noivsxjnfv~64zoUVbPepyJFQKenRtX844HgOESNcUp~FoVzI~QJne5irJDMLK1dNsua3L1kz0MA-2Aev8byWe4TIXeZCuDpYi4bRK6OPKDETwJG8edw7CFtsQaFI-2wGMFu8GDH7pUL8~1qyDjjFv5c~q1MFhty9q8LRUGHHgWP47u9n8OX4zcS4P1~5z2M3AAAA +paste.i2p2.i2p=PbHXL5PXan7siJiFcUAV~VC0JCLxgnoOnZFjyvJ0dbYlQ3fi1K6SD961pjQ51OSeTnbe5iGRzbY2X0~pG4k~hexau4NizxprAdgdiC-4J3-xpVRjZ4IxuMoDXp-V8Nhv8pLCQcxiEXbWft2v7zLvkp2y6uqH7kab8FXL~z568rMMH0DDs8imwAawasyGtLLo77X8n-C0K~7orcWDVZicWABJ-zky1Zlllx~Y~S8RHWyN4dueP6wkH484b81xNbbt3P-HzE3TcKAvUcSV1Bq4J5UNafQYU7DhV7roUtw4HuJYoxiXnlXVeC-uTCGF~bPrjrB-~Yn0KyObmXs5yvAcKHIS2tgmlsP9nahyn1ZOrlZc0L3DEsv4rkfQyzHVBxcCzMUOchWehE09GLy3bviWZ43lB7kU8kRaja7G4xLrD-CXNXq6q7WNYXrqX7EmtsvCo8VDcFn2ODyLb3eyDe~CkO7ES7mv3u8jJxJRQEcjj71pvu7bMzSMh-xN08X6vx9AAAAA From dec4205890683e44c73e3c622dd2b0010c331ddd Mon Sep 17 00:00:00 2001 From: dev Date: Sat, 3 Oct 2009 18:11:58 +0000 Subject: [PATCH 2/3] * added paste.i2p2.i2p to readme[LANG=EN] * added paste.i2p2.i2p to readme[LANG=DE] --- readme.html | 2 ++ readme_de.html | 1 + 2 files changed, 3 insertions(+) diff --git a/readme.html b/readme.html index 926f5b366..d57d16792 100644 --- a/readme.html +++ b/readme.html @@ -32,6 +32,8 @@ up, you can:

Freenet proxy
  • echelon.i2p: software archive and information for I2P
    • +
  • paste.i2p2.i2p: secure and + anonymous paste service.

    • Es gibt viel mehr Eepsites - folge einfach den Links die du findest, bookmarke Deine Favoriten und besuche sie oft!
    From 9b97d32ea81e6a6b9e24372d79af950e269d9163 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 4 Oct 2009 14:06:14 +0000 Subject: [PATCH 3/3] fix snark npe caused by last checkin --- apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java | 1 + apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java | 4 +++- history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index d9326fcd2..cbb1d1714 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -334,6 +334,7 @@ public class I2PSnarkUtil { return rv; } + /** @param ot non-null */ public void setOpenTrackerString(String ot) { _opts.put(PROP_OPENTRACKERS, ot); } diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index f5d7918b8..7e199ed59 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -194,7 +194,9 @@ public class SnarkManager implements Snark.CompleteListener { _util.setProxy(eepHost, eepPort); _util.setMaxUploaders(getInt(PROP_UPLOADERS_TOTAL, Snark.MAX_TOTAL_UPLOADERS)); _util.setMaxUpBW(getInt(PROP_UPBW_MAX, DEFAULT_MAX_UP_BW)); - _util.setOpenTrackerString(_config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS)); + String ot = _config.getProperty(I2PSnarkUtil.PROP_OPENTRACKERS); + if (ot != null) + _util.setOpenTrackerString(ot); getDataDir().mkdirs(); } diff --git a/history.txt b/history.txt index 97bf4a642..524b521ea 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2009-10-04 zzz + * i2psnark: Fix NPE caused by last checkin (thanks wuxia!) + 2009-10-02 zzz * BuildMessageTest: Move out of the lib * i2psnark: Fix changing opentracker list diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index f4891fba6..b9e65a109 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/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 = 21; + public final static long BUILD = 22; /** for example "-test" */ public final static String EXTRA = "-rc"; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;