* 2008-02-10 0.6.1.31 released

2008-02-10 Complication
    * Update news and version numbers

apps/addressbook/java/src/addressbook/Daemon.java

@@ -98,7 +98,8 @@ public class Daemon {
         AddressBook router = new AddressBook(routerFile);
         
         List defaultSubs = new LinkedList();
-        defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
+        // defaultSubs.add("http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/hosts.txt");
+        defaultSubs.add("http://www.i2p2.i2p/hosts.txt");
         
         SubscriptionList subscriptions = new SubscriptionList(subscriptionFile,
                 etagsFile, lastModifiedFile, defaultSubs, (String) settings

apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

@@ -22,7 +22,7 @@ public class ConfigUpdateHandler extends FormHandler {
 
     public static final String PROP_NEWS_URL = "router.newsURL";
 //  public static final String DEFAULT_NEWS_URL = "http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/news.xml?rev=HEAD";
-    public static final String DEFAULT_NEWS_URL = "http://dev.i2p/cgi-bin/cvsweb.cgi/i2p/news.xml?rev=HEAD";
+    public static final String DEFAULT_NEWS_URL = "http://complication.i2p/news.xml";
     public static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency";
     public static final String DEFAULT_REFRESH_FREQUENCY = 12*60*60*1000 + "";
     public static final String PROP_UPDATE_POLICY = "router.updatePolicy";

apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java

@@ -221,8 +221,8 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     }
     
     public void transferFailed(String url, long bytesTransferred, long bytesRemaining, int currentAttempt) {
-        if (_log.shouldLog(Log.ERROR))
-            _log.error("Failed to fetch the news from " + url);
+        if (_log.shouldLog(Log.WARN))
+            _log.warn("Failed to fetch the news from " + url);
         File temp = new File(TEMP_NEWS_FILE);
         temp.delete();
     }

apps/routerconsole/java/src/net/i2p/router/web/ReseedHandler.java

@@ -18,8 +18,8 @@ import net.i2p.util.I2PThread;
 import net.i2p.util.EepGet;
 
 /**
- * Handler to deal with reseed requests.  This reseed from the URL
- * http://dev.i2p.net/i2pdb2/ unless the I2P configuration property "i2p.reseedURL" is
+ * Handler to deal with reseed requests.  This will reseed from the URL
+ * http://i2pdb.tin0.de/netDb/ unless the I2P configuration property "i2p.reseedURL" is
  * set.  It always writes to ./netDb/, so don't mess with that.
  *
  */
@@ -31,7 +31,7 @@ public class ReseedHandler {
     // Reject unreasonably big files, because we download into a ByteArrayOutputStream.
     private static final long MAX_RESEED_RESPONSE_SIZE = 8 * 1024 * 1024;
 
-    private static final String DEFAULT_SEED_URL = "http://dev.i2p.net/i2pdb2/";
+    private static final String DEFAULT_SEED_URL = "http://i2pdb.tin0.de/netDb/";
 
     public ReseedHandler() {
         this(ContextHelper.getContext(null));

apps/routerconsole/jsp/help.jsp

@@ -34,7 +34,7 @@ Their XML parser requires the Sun XML APIs (JAXP) which is included in binary fo
 by their binary code license.  This product includes software developed by the Apache Software Foundation 
 (http://www.apache.org/). </p>
 
-<p>Another application you can see on this webpage is <a href="http://www.i2p.net/i2ptunnel">I2PTunnel</a>
+<p>Another application you can see on this webpage is <a href="http://www.i2p2.i2p/i2ptunnel">I2PTunnel</a>
 (your <a href="i2ptunnel/" target="_blank">web interface</a>) - a GPL'ed application written by mihi that
 lets you tunnel normal TCP/IP traffic over I2P (such as the eepproxy and the irc proxy).  There is also a
 <a href="http://susi.i2p/">susimail</a> web based mail client <a href="susimail/susimail">available</a> on
@@ -42,14 +42,14 @@ the console, which is a GPL'ed application written by susi23.  The addressbook a
 <a href="http://ragnarok.i2p/">Ragnarok</a> helps maintain your hosts.txt files (see ./addressbook/ for
 more information).</p>
 
-<p>The router by default also includes human's public domain <a href="http://www.i2p.net/sam">SAM</a> bridge,
+<p>The router by default also includes human's public domain <a href="http://www.i2p2.i2p/sam">SAM</a> bridge,
 which other client applications (such the <a href="http://duck.i2p/i2p-bt/">bittorrent port</a>) can use.  
 There is also an optimized library for doing large number calculations - jbigi - which in turn uses the 
 LGPL licensed <a href="http://swox.com/gmp/">GMP</a> library, tuned for various PC architectures.  Launchers for windows users are built with <a href="http://launch4j.sourceforge.net/">Launch4J</a>, and the installer is built with <a href="http://www.izforge.com/izpack/">IzPack</a>.  For 
 details on other applications available, as well as their licenses, please see the 
-<a href="http://www.i2p.net/licenses">license policy</a>.  Source for the I2P code and most bundled
-client applications can be found on our <a href="http://www.i2p.net/download">download page</a>, and is
-in <a href="http://www.i2p.net/cvs">cvs</a>.</p>
+<a href="http://www.i2p2.i2p/licenses">license policy</a>.  Source for the I2P code and most bundled
+client applications can be found on our <a href="http://www.i2p2.i2p/download">download page</a>.
+.</p>
 
 <h2>Release history</h2>
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" />
@@ -59,9 +59,8 @@ in <a href="http://www.i2p.net/cvs">cvs</a>.</p>
  <jsp:getProperty name="contenthelper" property="textContent" />
  
  <p>
- A more complete list of updates can be found 
- <a href="http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/history.txt?rev=HEAD">online</a> 
- (<a href="http://dev.i2p/cgi-bin/cvsweb.cgi/i2p/history.txt?rev=HEAD">anonymously</a>)
+ A more complete list of changes can be found 
+ in the history.txt file in your i2p directory.
  </p>
 </div>
 

apps/susidns/src/jsp/index.jsp

@@ -59,7 +59,7 @@ eepsites announced on other sites if you subscribe to those sites' addressbooks.
 </p>
 <p>
 (To speak the truth: In its default configuration the addressbook does not poll
-additional sites, but dev.i2p only. Subscribing to additional sites is an easy task,
+additional sites, but www.i2p2.i2p only. Subscribing to additional sites is an easy task,
 just add them to your <a href="subscriptions.jsp">subscriptions</a> file.)
 </p>
 <p>If you have questions about naming in i2p, there is an excellent <a href="http://forum.i2p.net/viewtopic.php?t=134">introduction</a>

apps/susidns/src/jsp/subscriptions.jsp

@@ -68,7 +68,7 @@ subscriptions *
 <p class="help">
 The subscription file contains a list of (i2p) URLs. The addressbook application
 regularly (once per hour) checks this list for new eepsites. Those URLs simply contain the published hosts.txt
-file of other people. The default subscription is the hosts.txt from dev.i2p, which is updated infrequently.
+file of other people. The default subscription is the hosts.txt from www.i2p2.i2p, which is updated infrequently.
 So it is a good idea to add additional subscriptions to sites that have the latest addresses.
 </p>
 </div>

build.xml

@@ -138,6 +138,9 @@
                 <pathelement location="apps/i2ptunnel/java/src" />
                 <pathelement location="apps/systray/java/src" />
                 <pathelement location="apps/routerconsole/java/src" />
+                <pathelement location="apps/addressbook/java/src" />
+                <pathelement location="apps/i2psnark/java/src" />
+                <pathelement location="apps/sam/java/src" />
             </sourcepath>
             <classpath>
                 <pathelement location="apps/jetty/jettylib/org.mortbay.jetty.jar" />

checklist.txt

@@ -0,0 +1,52 @@
+Release checklist
+-----------------
+
+Sync with mtn.i2p2.i2p
+Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p
+
+Change revision in:
+	history.txt
+	initialNews.xml
+	installer/install.xml
+	news.xml
+	router/java/src/net/i2p/router/RouterVersion.java
+
+Build and tag:
+	ant dist
+	mtn ci
+	mtn tag i2p-0.6.1.xx
+	Sync with mtn.i2p2.i2p
+
+Create a signed update file with:
+	export I2P=~/i2p
+	java -cp $I2P/lib/i2p.jar net.i2p.crypto.TrustedUpdate sign i2pupdate.zip i2pupdate.sud /path/to/private.key 0.6.1.xx
+
+Verify signed update file with:
+	java -cp $I2P/lib/i2p.jar net.i2p.crypto.TrustedUpdate showversion i2pupdate.sud
+	java -cp $I2P/lib/i2p.jar net.i2p.crypto.TrustedUpdate verifysig i2pupdate.sud
+
+Make the source tarball:
+	Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p i2p-0.6.1.xx
+	tar tjf i2p-0.6.1.xx.tar.bz2 --exclude i2p-0.6.1.xx/_MTN i2p-0.6.1.xx	
+	mv i2p-0.6.1.xx.tar.bz2 i2p.i2p
+
+More signatures:
+	sha1sum i2pinstall.exe i2p.tar.bz2 i2p-0.6.1.xx.tar.bz2 i2pupdate.zip
+	gpg -b i2pinstall.exe
+	gpg -b i2p.tar.bz2
+	gpg -b i2p-0.6.1.xx.tar.bz2
+	gpg -b i2pupdate.zip
+
+Distribute files to download locations and to www.i2p2.i2p
+
+Website files to change:
+	Sync with mtn.i2p2.i2p
+	announcements.html
+	download.html (change SHA1s)
+	index.html
+	hosts.txt (copy from mtn)
+	Sync with mtn.i2p2.i2p
+
+Copy news.xml to subscription location
+
+Announce on #i2p, forum.i2p, Syndie

core/java/src/net/i2p/crypto/TrustedUpdate.java

@@ -79,6 +79,26 @@ lFm5Fqx/iW5+k0QaQZ3W9mY=
 =V3i7
 -----END PGP SIGNATURE-----
 */
+/*
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+*/
+    /* Complication's key */
+    private static final String DEFAULT_TRUSTED_KEY3 =
+        "JHFA0yXUgKtmhajXFZH9Nk62OPRHbvvQHTi8EANV-D~3tjLjaz9p9cs6F" +
+        "s8W3FSLfUwsQeFg7dfVSQQZga~1jMjboo94vIcm3j6XbW4mbcorVQ74uP" +
+        "jd8EA1AQhJ6bBTxDAFk~6fVDOdhHT0Wo5CcUn7v8bAYY3x3UWiL8Remx0=";
+/*
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFHphOV+h38a3n8zjMRAll+AJ9KA6WiDJcTN4qfrslSemUMr+FBrwCeM8pF
+D8usM7Dxp5yrDrCYZ5AIijc=
+=SrXI
+-----END PGP SIGNATURE-----
+*/
+
     private static final String VALID_VERSION_CHARS = "0123456789.";
     private static final int    VERSION_BYTES       = 16;
     private static final int    HEADER_BYTES        = Signature.SIGNATURE_BYTES + VERSION_BYTES;
@@ -119,6 +139,7 @@ lFm5Fqx/iW5+k0QaQZ3W9mY=
         } else {
             _trustedKeys.add(DEFAULT_TRUSTED_KEY);
             _trustedKeys.add(DEFAULT_TRUSTED_KEY2);
+            _trustedKeys.add(DEFAULT_TRUSTED_KEY3);
         }
         if (_log.shouldLog(Log.DEBUG))
             _log.debug("TrustedUpdate created, trusting " + _trustedKeys.size() + " keys.");

history.txt

@@ -1,4 +1,48 @@
-$Id: history.txt,v 1.613 2008-01-08 21:15:45 zzz Exp $
+* 2008-02-10  0.6.1.31 released
+
+2008-02-10 Complication
+    * Update news and version numbers
+
+2008-02-06 zzz
+    * build.xml: Add some apps to javadoc
+    * checklist.txt: Add some things
+    * news.xml: make links relative
+    * runplain.sh: Add some comments
+    * wrapper.config: Add some comments
+
+2008-02-05 Complication
+    * Change the dates too (sorry for such forgetfulness!)
+
+2008-02-04 Complication
+    * Also use the new key for checking, and add it into news.xml
+
+2008-02-04 Complication
+    * Added my release signing key into TrustedUpdate.java
+
+2008-01-31 zzz
+    * NewsFetcher: Change fetch failed from error to warning
+    * installer: Fix URL and "email"
+    * checklist.txt: New release checklist
+
+2008-01-29 zzz
+    * Addressbook: Change default subscription
+    * ConfigUpdateHandler: Change default news URL
+    * initialNews.xml: Update version to .31
+    * news.xml: More updates
+    * hosts.txt: Add i2p-projekt.i2p
+    * readme.html: More URL updates
+    * SusiDNS: Change references to default subscription
+
+2008-01-28 zzz
+    * news.xml: Updates, still preliminary
+    * ReseedHandler: Change default URL
+    * i2ptunnel.config: Change default outproxies
+    * readme.html: Change *.i2p.net URLs
+    * help.jsp: Change *.i2p.net URLs
+    * eepsite_index.html: Change stats.i2p addressbook subscription URL
+    * hosts.txt: Add krabs.i2p, true.i2p, www.i2p2.i2p
+
+* 2008-01-28  0.6.1.30-20 converted from CVS to MTN
 
 2008-01-08 zzz
     * addressbook: Limit size of subscribed hosts.txt,
@@ -12,7 +56,6 @@ $Id: history.txt,v 1.613 2008-01-08 21:15:45 zzz Exp $
     * Error pages: add icon and logo,
         clarify 'destination not found' and 'proxy not found' pages
 
-
 2008-01-07 zzz
     * profiles.jsp formatting cleanup
     * NTCP: Reduce max idle time from 60m to 20m

hosts.txt

@@ -1,214 +1,3 @@
-; TC's hosts.txt guaranteed freshness
-; $Id: hosts.txt,v 1.172 2007-11-06 06:26:01 jrandom Exp $
-; changelog:
-; (1.193) added i2host.i2p (was i2phost.i2p)
-; (1.192) added trevorreznik.i2p
-; (1.191) added trac.i2p
-; (1.190) added archive.syndie.i2p
-; (1.189) added mtn.i2p
-; (1.188) added downloads.legion.i2p, politguy.i2p, ninja.i2p
-; (1.187) added hidden.i2p, bk1k.i2p, antipiracyagency.i2p
-; (1.186) added decadence.i2p, freedomarchives.i2p, closedshop.i2p
-; (1.185) added TheBreton.i2p adab.i2p awup.i2p china.i2p davidkra.i2p
-;               comwiz.i2p dust.i2p eepsites.i2p jmg.i2p kuroneko.i2p
-;               mywastedlife.i2p site.games.i2p squid2.i2p striker.i2p
-;               tracker.awup.i2p zzz.i2p
-; (1.184) added sion.i2p, betaguru.i2p jnymo.i2p always.i2p gonzo2000.i2p 
-;               flipkick.i2p mindisl0st.i2p torapa.i2p wahoo.i2p badfish.i2p
-;               slack.i2p bobcat.i2p pycache.awup.i2p lp.i2p amazone.i2p 
-;               inproxy.tino.i2p kohaar.i2p
-; (1.183) added ttc.i2p
-; (1.182) added tracker-fr.i2p
-; (1.181) added syncline.i2p, cerebrum.i2p, news.underscore.i2p,
-;               onionforum.i2p, frostmirror.i2p, ptm.i2p, gloinsblog.i2p
-;               underscore.i2p, mac7.i2p, wiht.i2p, jazzy.i2p, trwcln.i2p
-; (1.180) added tino.i2p and fproxy.tino.i2p
-; (1.179) added glog.i2p
-; (1.178) added syndie.i2p and syndiemedia.i2p
-; (1.177) added irc.freshcoffee.i2p
-; (1.176) added surrender.adab.i2p
-; (1.175) added terror.i2p
-; (1.174) added irc.arcturus.i2p
-; (1.173) added tracker.postman.i2p, hq.postman.i2p
-; (1.172) added i2p-bt.postman.i2p
-; (1.171) added luckypunk.i2p
-; (1.170) added bash.i2p, stats.i2p
-; (1.169) added archive.i2p, www.fr.i2p, romster.i2p, marshmallow.i2p, openforums.i2p
-; (1.168) removed duplicate manveru.i2p
-; (1.167) added bittorrent.i2p
-; (1.166) added elf.i2p, de-ebooks.i2p, i2pchan.i2p, longhorn.i2p
-; (1.165) added amobius.i2p
-; (1.164) added google.i2p
-; (1.163) added mrplod.i2p
-; (1.162) added sirup.i2p
-; (1.161) added connelly.i2p
-; (1.160) added wspucktracker.i2p
-; (1.159) added 55cancri.i2p
-; (1.158) added tracker.fr.i2p
-; (1.157) added v2mail.i2p, complication.i2p
-; (1.156) added lazyguy.i2p
-; (1.155) added confessions.i2p, rsync.thetower.i2p, redzara.i2p, gaytorrents.i2p
-; (1.154) added arkan.i2p, search.i2p, floureszination.i2p, antipiratbyran.i2p
-;               asylum.i2p, templar.i2p
-; (1.153) added feedspace.i2p
-; (1.152) added wiki.fr.i2p
-; (1.151) added septu.i2p
-; (1.150) added music.i2p, rotten.i2p, wintermute.i2p, kaji2.i2p, aspnet.i2p, 
-;               gaming.i2p, nntp.i2p
-; (1.149) added cowsay.i2p
-; (1.148) added irc.postman.i2p
-; (1.147) added subrosa.i2p
-; (1.146) added moxonom.i2p
-; (1.145) added sex0r.i2p flock.i2p cneal.i2p www.nntp.i2p wallsgetbombed.i2p
-;               thedarkside.i2p legion.i2p manveru.i2p books.manveru.i2p bt.i2p
-; (1.144) added riaa.i2p
-; (1.143) added mpaa.i2p
-; (1.142) added pants.i2p
-; (1.141) added irc.carambar.i2p
-; (1.140) added general.i2p
-; (1.139) added smeghead.i2p
-; (1.138) added nntp.fr.i2p
-; (1.137) added deadgod.i2p
-; (1.136) added manveru.i2p
-; (1.135) added fr.i2p
-; (1.134) added imhotep.i2p
-; (1.133) added jrandom.dev.i2p (ed. note: yes, i am me)
-; (1.132) added ttp.i2p
-; (1.131) added freenet.eco.i2p, tracker.i2p, photo.i2p
-; (1.130) added hopekiller.i2p, microsoft.i2p, jhor.i2p, badtoys.i2p
-; (1.129) added mindspore.i2p
-; (1.128) added irc.ircbnc.i2p
-; (1.127) added dvdr-core.i2p
-; (1.126) added j.i2p
-; (1.125) added bl.i2p
-; (1.124) removed jap.eco.i2p and bt1.eco.i2p (obsolete)
-; (1.123) added chat.i2p
-; (1.122) added phonebooth.i2p
-; (1.121) added up.i2p
-; (1.120) added dm.i2p
-; (1.119) added piespy.i2p
-; (1.118) added sciencebooks.i2p
-; (1.117) added forum.fr.i2p, fedo.i2p, and pastebin.i2p
-; (1.116) added frosk.i2p
-; (1.115) added theland.i2p
-; (1.114) added dox.i2p
-; (1.113) added amiga.i2p
-; (1.112) added frooze.i2p
-; (1.111) aliased gott.i2p as jrandom.i2p (ed. note: no, i am not gott)
-; (1.110) added sonax.i2p
-; (1.109) added 1.fcp.freenet.i2p and copied fcp.i2p to 2.fcp.freenet.i2p
-; (1.108) added asciiwhite.i2p
-; (1.107) added fcp.i2p
-; (1.106) added greenflog.i2p
-; (1.105) added bdl.i2p
-; (1.104) added bacardi.i2p and guttersnipe.i2p
-; (1.103) added evil.i2p
-; (1.102) added bsdm.i2p
-; (1.101) added eschaton.i2p
-; (1.100) added blog.curiosity.i2p
-; (1.99) added slacker.i2p
-; (1.98) added ses.i2p and pdforge.i2p
-; (1.97) added orion.i2p and protokol.i2p
-; (1.96) added blog.polecat.i2p
-; (1.95) added ciaran.i2p
-; (1.94) added polecat.i2p
-; (1.93) added susi.i2p
-; (1.92) removed duplicate beyond.i2p, added edge.i2p
-; (1.91) added shiftfox.i2p
-; (1.90) added underground.i2p
-; (1.89) renamed newsbytetest.i2p to newsbyte.i2p
-; (1.88) added newsbytetest.i2p
-; (1.87) updated curiosity.i2p (via signed email)
-; (1.86) added blueheron.i2p
-; (1.85) updated files.i2p (after verifying ident)
-; (1.84) added utansans.i2p
-; (1.83) added irc.orz.i2p
-; (1.82) added nano.i2p
-; (1.81) added ragnarok.i2p
-; (1.80) added marcos.i2p
-; (1.79) updated beyond.i2p's key
-; (1.78) added b.i2p
-; (1.77) added tinyurl.i2p
-; (1.76) added detonate.i2p
-; (1.75) added identiguy.i2p
-; (1.74) added jabber-2.i2p
-; (1.73) added jake.i2p
-; (1.72) added anonymnet.i2p sasquotch.i2p orz.i2p microbleu.i2p {www,smtp,pop3}.postman.i2p
-; (1.71) added curiosity.i2p
-; (1.70) added freeciv.nightblade.i2p
-; (1.69) added xolotl.i2p
-; (1.68) added modulus.i2p
-; (1.67) added eepdot.i2p
-; (1.66) removed datagram_test.i2p
-; (1.65) added socks1.tor.i2p
-; (1.64) added sugadude.i2p
-; (1.63) added files.i2p
-; (1.62) added beyond.i2p
-; (1.61) added gott.i2p
-; (1.60) added linuxagent.i2p
-; (1.59) added www.i2p, dev.i2p, and cvs.i2p, removed i2pcvs.i2p
-; (1.58) updated lucky.i2p (after not checking ID, but, c'mon...)
-; (1.57) added firerabbit.i2p
-; (1.56) added datagram_test.i2p
-; (1.55) updated ardvark.i2p (after checking ID)
-; (1.54) added files.nickster.i2p
-; (1.53) added brittanyworld.i2p
-; (1.52) added stasher.i2p
-; (1.51) changed quadn.i2p to library.i2p
-; (1.50) added freshcoffee.i2p
-; (1.49) added ems.i2p
-; (1.48) added ooo.i2p
-; (1.47) added fproxy2.i2p
-; (1.46) removed hypercubus.i2p
-; (1.45) added thetower.i2p
-; (1.44) added fproxy.i2p and mrflibble.i2p
-; (1.43) added files.hypercubus.i2p
-; (1.42) added www1.squid.i2p
-; (1.41) added quadn.i2p
-; (1.40) added nickster2.i2p and irc.nickster.i2p (pointing at IIP)
-; (1.39) added jdot.i2p
-; (1.38) added forum.i2p
-; (1.36) added ferret.i2p
-; (1.36) added anonynanny.i2p
-; (1.35) added hypercubus.i2p
-; (1.34) added ogg.baffled.i2p
-; (1.33) added morph.i2p
-; (1.32) added nickster.i2p
-; (1.31) added mush.zeit.i2p (i2p's first eepMUSH)
-; (1.30) added xilog.i2p
-; (1.29) added lucky.i2p, removed lp.i2p
-; (1.28) added sungo.i2p
-; (1.27) added jar.i2p
-; (1.26) added tor-www-proxy.i2p (WWW through tor by human - won't be up 24/7!)
-; (1.25) added ugha.i2p
-; (1.24) added reefer.i2p
-; (1.23) added nic.i2p
-; (1.22) added www.janonymous.i2p
-; (1.21) added bluebeam.i2p
-; (1.20) added echo.baffled.i2p (which runs mihi's echo server - telnet and get replies)
-; (1.19) added irc.baffled.i2p (which is hooked up with irc.duck.i2p over i2p)
-; (1.18) added www.aum.i2p, nntp.baffled.i2p, www.baffled.i2p, and ardvark.i2p
-; (1.17) added gernika's eepsite
-; (1.16) added duck's scp and hosting server
-; (1.15) added eco's beta i2psnark server
-; (1.14) added duck's pgp keyserver
-; (1.13) added human's eepsite, the mail servers, and luckypunk's eepsite
-; (1.12) added fillament's chessd server (FICS based clients or telnet to it)
-; (1.11) added mp3.tc.i2p and mesh.firerabbit.i2p
-; (1.10) added aum's mp3 and ogg streams
-; (1.9) added the FCP and HTTP keys for a private entropy node, as well as nm's eepsite
-; (1.8) updated nightblade's eepsite (after confirming ident w/ trent on iip)
-; (1.7) added aum's eepsite
-; (1.6) added fillament's flog/plog and eco's eepsite
-; (1.5) added duck's irc
-; (1.4) added eco's JAP tunnel
-; (1.3) added duck's eepsite
-; (1.2) fixed duck's subdomain names
-; (1.1) added nntp, jabber, squid, and i2pcvs (and imported into i2p's cvs for distribution)
-; (1.0) added dyad.i2p and nightblade.i2p
-; (0.5) added bozo.i2p
-; (0.0)	added tc.i2p
-;
 tc.i2p=3RPLOkQGlq8anNyNWhjbMyHxpAvUyUJKbiUejI80DnPR59T3blc7-XrBhQ2iPbf-BRAR~v1j34Kpba1eDyhPk2gevsE6ULO1irarJ3~C9WcQH2wAbNiVwfWqbh6onQ~YmkSpGNwGHD6ytwbvTyXeBJcS8e6gmfNN-sYLn1aQu8UqWB3D6BmTfLtyS3eqWVk66Nrzmwy8E1Hvq5z~1lukYb~cyiDO1oZHAOLyUQtd9eN16yJY~2SRG8LiscpPMl9nSJUr6fmXMUubW-M7QGFH82Om-735PJUk6WMy1Hi9Vgh4Pxhdl7gfqGRWioFABdhcypb7p1Ca77p73uabLDFK-SjIYmdj7TwSdbNa6PCmzEvCEW~IZeZmnZC5B6pK30AdmD9vc641wUGce9xTJVfNRupf5L7pSsVIISix6FkKQk-FTW2RsZKLbuMCYMaPzLEx5gzODEqtI6Jf2teMd5xCz51RPayDJl~lJ-W0IWYfosnjM~KxYaqc4agviBuF5ZWeAAAA
 dyad.i2p=W~JFpqSH8uopylox2V5hMbpcHSsb-dJkSKvdJ1vj~KQcUFJWXFyfbetBAukcGH5S559aK9oslU0qbVoMDlJITVC4OXfXSnVbJBP1IhsK8SvjSYicjmIi2fA~k4HvSh9Wxu~bg8yo~jgfHA8tjYppK9QKc56BpkJb~hx0nNGy4Ny9eW~6A5AwAmHvwdt5NqcREYRMjRd63dMGm8BcEe-6FbOyMo3dnIFcETWAe8TCeoMxm~S1n~6Jlinw3ETxv-L6lQkhFFWnC5zyzQ~4JhVxxT3taTMYXg8td4CBGmrS078jcjW63rlSiQgZBlYfN3iEYmurhuIEV9NXRcmnMrBOQUAoXPpVuRIxJbaQNDL71FO2iv424n4YjKs84suAho34GGQKq7WoL5V5KQgihfcl0f~xne-qP3FtpoPFeyA9x-sA2JWDAsxoZlfvgkiP5eyOn23prT9TJK47HCVilHSV11uTVaC4Jc5YsjoBCZadWbgQnMCKlZ4jk-bLE1PSWLg7AAAA
 nightblade.i2p=nyErwSseXbsojcWtNkDyUul0YULtqr6qyWSzIp639Ygpe8juCdgPMLURVXcmlCvo~QPoHg6zt53KpgpGvB1-Wv2SGvc2Mvs~o8USw3ius8fP1URphqcBbulK8Ci0bgknt0kD0AfxqfMz-p~xk1QEMxq2kZEoB3oyIIFnQlpb2ByS74Lx8iKzXTrwWk19I3Dvu4nIq8CBDDwu3lYoCD2kC-jT5pjgglverGPEGN4o55LYVTtfSg4gAJFZeaE4KjBR5P1z7cca6UDjGMWfR0iCa8P3qpkY2ODYpk~8w2xgBbgDq-8Hzik~uraHc598ccS8QpwB0f0Jw~2PZcTjOPdZ-239U6p3tESXa7FXzRBCujv4Bx6CVFRhCmBHpyFnCD-MugZ~vR6XFSS2XBsCT~duXKq94HH2n1iAWslG4Vu44ut1JVhDPFzp~Dk7wujB0tCo2HXH2icRQxOWe37foU4LZSJ4oMpFDACBzwSfcZdIPsVRxGttKQx4yzgffR1Q~Jl7AAAA
@@ -508,4 +297,7 @@ archive.syndie.i2p=iXX0DadZTJQpPr1to0OmQ4xokHgx1HYd5ec7~zIjQ80W~p4kRCYJmEzibH2Kn
 trac.i2p=OBnF9NtkEsPij2F-lp3bWDVrJsPQQPdq6adlpq0N4BY1XRjtDBZl~EpDdk7roq49~ptKAQG2cNUeBEKIIrdlZhJio5pMwUl6YinizzkNTFfZipB5OKoB7PBulxkw-N9mKMhS1btd9ajcV8tiP3xiv7VSlgiDwbdKg1fmkvNrVrJnzkN3-ey2kebYnbh7jjU2gPFUl~CwSEkIi6AK9EfqmFR-DUVohyygqAY~fi4EMeTVXGUqftXSNFYUwpRJgFrWRPTurtZnJK5403q67oEk0eWrPIZ8ytJWSBfffAXL3ts~0O1FZeKXUccsAl33j70~lklSolNVLJ40y-6X5ZLWajmX0ONU3j0qI5A~7fgNgsg-vKypPDuzl8ug-D~BmhqdAf0sRYmziDVwTgU~WRB6IzhhXFR6CbwrGXdgOGg2qNT1eOnMwGo3SMMJ7kK88VC5LdYg2dyiyjZATuvT92QdZglrVQIeBqAehcFjOBuycC1ED3AOak8D9Xplj7V6hN-HAAAA
 trevorreznik.i2p=FxoG5dx6WuF8gu0Fc4ItB61hd8dBZ0L6FjkvoA-kQrC0DcY5YUqKBUmrcxzKhKo4nLyg0jRV-RSNUuWsali44dmpHQ6wuFjCGTr5zMk0NoVUpBsBNtHLEQWxROnuQFlQAq6x~eVdU5bAvnNFd-6RXDJ86Br9bf5YG4PHmZPon7ld3t1kAvPaZepITKlIq5iXy3va-pzAMFEIhDtLMzFjGhLWMg9m-8tkx4577WvzUWbSAUdxKkxwjecIzbTDTQsZld~t5MkaMmn5UpNX6Gh3iDUPWHXOjn4I8MIELiSaeRdpHDgua3mo~p8oO0QvWBgn~jQ8yr6nz7vMAdoRtOwPlUqHCCM1BsPVcN9a92rPpTFBk0BXikjJJrkDDIaFjJnKmRAsEUoa-eHaPV~RS0QPrfuzlp0XjBzQcAQjNIw6hO4xqJujSs8SdObMpQAqCR5Sc5NzOvTr5eAzCIz0gmQnKrA1RJVOebKDERM~qQ6rFrdVDkjLEJd6SyjUr-TdIrayAAAA
 i2host.i2p=FkX89~FOWc2HjTeVerud7hzZCtQNDKqEvMeJiDEnSzneA44hhDEDSbjiDuEWOCPwvgCwrzMg9o3apHXosNMnRVTYlYIJWb1~fgRnzkHIJnz2yrojLcTElTLMgQSzHdV04ock3oPHjw8r2j73hnTiq5u3HhexT0D-IK02S0GUd9cPcP2YnWlNMnGuA-J6s7VHUd5mUhBO3LeOcOusBUOjsbt79bwBZYsnnVV~JRSVzHPd8kYbRMEjDuyaIJHEr2pkwwtrk~BqLeZ5UCbbVob1-733FtOfQXjKTpFPK~IlHDM7ItgXt77U5KZHkZ54WQYJNCE6HlE7LhFB79cqjgvxXTfvyjoqZVJ1lq1yFS8GtLcnurJLkN5BleCEDJEK3D7kCymCpngW9wlKjakEc85ZculU65neqIpqIk6noir6e1vseeUZKxBM3k6AYkLoFYSh98PpENjTHUdaNTl1kQA2Mmi9zobGS0gn0~RWHFord19TC5ReBtOFWkseksHp-5-nAAAA
-
+true.i2p=Jeb1Ctlh55wWezbA~sCxYQsreDPS~qFJ6DeNMPl7~Kx0w1Odh8YE3QKrZS7WlNqeoRNJLyPgf7h19Tosb-ATZOPDH7B4pQvI4CdlTv-Uimq4dI71PRRZQr3mCBihW~WtVReDOO3JiDf1Bx225xhTmWp0KYo5AM91EW0TcHi8immHBFB9jcjekPoU~zlVAqy5S07LnS7f7rWtC7kno983Dyi9arWDPmnnzu2QD4mMrH0EkuuoBqwUi1HBUNhTn~lL8KqfSpg9j9q-eqd~eixF3nOlsrxMFuWVV1HOUtyMUTRGEX4i4IDPWmRQeFZ0gmfeBYdad~nG1X7uBVeeEtGSrggnegXoSE4oaIuONNXYORsevZn8UahC~kkNWg1wPQtr57TirhLirkF2qHUuwAqe5G00PIhC0-J8K5Ye0QDd5a1coQT87kBgcqLcbSR1oGIjxv2Ma6970Fv65a2a~YKqZZbuGof5-5-7X48SVhOigmo2c-COyt2rXoQlGQpBWtDsAAAA
+krabs.i2p=k6qIwzff6s1RiRQQy9O6cliBTfHffKZ2F~pVG8nmCqMxEpPnywynFa9XVS6VBbhxGRAMG~PIb2IaFRYS5GFdM3fnnJ~Cn2AbN-qsqbl6cXExj5Fy9Cd-aPR44XW0NE9qjFPiN~6JUOg0fitF65RmsMrFvHq9LM2zOFxOfnPKVsBJGRpjhp6EPRNrkXvzQTw7x6~kqUJ-VGW0avjrz4EmgT6Wias5z0EPioneKOhG-1NepL8HqEv9ryGt31~kmI1-B0cS8v1riaXH0rZWjJ0VvUFEoJ3sHCir4vsnSf1YQIKMUO~zKlgTVZBsw8P2ILFFihs0g9KMIWVjJqqo0PzCM1O-LW90hirn~Ryh4zOZI-orIiV9Oqu96Fj2bvBYSka11TY7erLOCk64tc5NwxvlJQ3F-lk0ZFGvYuU~l45mi0khFLnDnzhDFtcY6YNLRG8hmv9IR2MrG9TJFfSwXdx11LI-57tkRi9Jw4s8OjLijNNDOJX~rVgwZVVIEQcOhGxkAAAA
+www.i2p2.i2p=-KR6qyfPWXoN~F3UzzYSMIsaRy4udcRkHu2Dx9syXSzUQXQdi2Af1TV2UMH3PpPuNu-GwrqihwmLSkPFg4fv4yQQY3E10VeQVuI67dn5vlan3NGMsjqxoXTSHHt7C3nX3szXK90JSoO~tRMDl1xyqtKm94-RpIyNcLXofd0H6b02683CQIjb-7JiCpDD0zharm6SU54rhdisIUVXpi1xYgg2pKVpssL~KCp7RAGzpt2rSgz~RHFsecqGBeFwJdiko-6CYW~tcBcigM8ea57LK7JjCFVhOoYTqgk95AG04-hfehnmBtuAFHWklFyFh88x6mS9sbVPvi-am4La0G0jvUJw9a3wQ67jMr6KWQ~w~bFe~FDqoZqVXl8t88qHPIvXelvWw2Y8EMSF5PJhWw~AZfoWOA5VQVYvcmGzZIEKtFGE7bgQf3rFtJ2FAtig9XXBsoLisHbJgeVb29Ew5E7bkwxvEe9NYkIqvrKvUAt1i55we0Nkt6xlEdhBqg6xXOyIAAAA
+i2p-projekt.i2p=8ZAW~KzGFMUEj0pdchy6GQOOZbuzbqpWtiApEj8LHy2~O~58XKxRrA43cA23a9oDpNZDqWhRWEtehSnX5NoCwJcXWWdO1ksKEUim6cQLP-VpQyuZTIIqwSADwgoe6ikxZG0NGvy5FijgxF4EW9zg39nhUNKRejYNHhOBZKIX38qYyXoB8XCVJybKg89aMMPsCT884F0CLBKbHeYhpYGmhE4YW~aV21c5pebivvxeJPWuTBAOmYxAIgJE3fFU-fucQn9YyGUFa8F3t-0Vco-9qVNSEWfgrdXOdKT6orr3sfssiKo3ybRWdTpxycZ6wB4qHWgTSU5A-gOA3ACTCMZBsASN3W5cz6GRZCspQ0HNu~R~nJ8V06Mmw~iVYOu5lDvipmG6-dJky6XRxCedczxMM1GWFoieQ8Ysfuxq-j8keEtaYmyUQme6TcviCEvQsxyVirr~dTC-F8aZ~y2AlG5IJz5KD02nO6TRkI2fgjHhv9OZ9nskh-I2jxAzFP6Is1kyAAAA

initialNews.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2007-08-23 19:33:29 $">
- <i2p.release version="0.6.1.30" date="2007/02/15" minVersion="0.6"
+<i2p.news date="$Date: 2008-02-10 15:00:00 $">
+ <i2p.release version="0.6.1.31" date="2008/02/10" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 

installer/install.xml

@@ -4,11 +4,11 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.6.1.30</appversion>
+        <appversion>0.6.1.31</appversion>
         <authors>
-            <author name="I2P" email="support@i2p.net"/>
+            <author name="I2P" email="http://forum.i2p.net"/>
         </authors>
-        <url>http://www.i2p.net</url>
+        <url>http://www.i2p2.de</url>
     </info>
 
     <guiprefs width="590" height="356" resizable="yes">

installer/resources/dnfh-header.ht

@@ -38,8 +38,7 @@ div.logo {
 <div class=warning id=warning>
 The eepsite was not found in your router's addressbook.
 Check the link or find a BASE64 address.
-If you have the BASE64 address,  paste it into your userhosts.txt using SusiDNS
-<a href="http://localhost:7657/susidns/addressbook.jsp?book=master">here</a>.
-or use a BASE64 address helper.
-You may be able to find the eepsite's address helper at <a href="http://orion.i2p">orion.i2p</a>.
+If you have the BASE64 address,  paste it into your userhosts.txt using
+<a href="http://localhost:7657/susidns/addressbook.jsp?book=master">SusiDNS</a>,
+use a BASE64 address helper, or use a jump service link below.
 <BR><BR>Could not find the following destination:<BR><BR>

installer/resources/eepsite_index.html

@@ -70,7 +70,7 @@
      and add a couple of these -
      <a href="http://orion.i2p/hosts.txt">http://orion.i2p/hosts.txt</a>,
      <a href="http://tino.i2p/hosts.txt">http://tino.i2p/hosts.txt</a>,
-     <a href="http://stats.i2p/newhosts.txt">http://stats.i2p/newhosts.txt</a>,
+     <a href="http://stats.i2p/cgi-bin/newhosts.txt">http://stats.i2p/cgi-bin/newhosts.txt</a>,
      <a href="http://trevorreznik.i2p/hosts.txt">http://trevorreznik.i2p/hosts.txt</a> and hit "Save".
      Now you will get updates too!
  <li>If you are in a hurry and can't wait a few hours, you can tell people to use a "jump" address helper redirection service.

installer/resources/i2ptunnel.config

@@ -5,7 +5,7 @@ tunnel.0.type=httpclient
 tunnel.0.sharedClient=true
 tunnel.0.interface=127.0.0.1
 tunnel.0.listenPort=4444
-tunnel.0.proxyList=squid.i2p
+tunnel.0.proxyList=true.i2p,krabs.i2p
 tunnel.0.i2cpHost=127.0.0.1
 tunnel.0.i2cpPort=7654
 tunnel.0.option.inbound.nickname=shared clients

installer/resources/runplain.sh

@@ -1,3 +1,10 @@
+#
+# This runs the router by itself, WITHOUT the wrapper.
+# This means the router will not restart if it crashes.
+# Also, you will be using the default memory size, which is
+# probably not enough for i2p.
+# You should really use the i2prouter script instead.
+#
 export CP=. ; for j in lib/*  ; do export CP=$CP:$j ; done;
 JAVA=java
 

installer/resources/wrapper.config

@@ -1,5 +1,11 @@
 #********************************************************************
 # Wrapper Properties
+#
+# WARNING - for any changes to take effect, you must completely
+# stop the router and the wrapper. Clicking 'Restart' on your
+# router console will NOT reread this file! You must
+# click "Shutdown", wait 11 minutes, then start i2p.
+#
 #********************************************************************
 # Java Application
 wrapper.java.command=java
@@ -60,6 +66,13 @@ wrapper.java.additional.4=-Dorg.mortbay.xml.XmlParser.NotValidating=true
 # The JVM's default is 64MB, and I2P can work fine in that, but to handle
 # lots of I2PSnark activity in the same JVM, increasing the default max heap
 # size should help.  Feel free to reduce this if not using I2PSnark in the jvm
+# High-bandwidth routers may need to increase to 256 or more.
+#
+# WARNING - for any changes to take effect, you must completely
+# stop the router and the wrapper. Clicking 'Restart' on your
+# router console will NOT reread this file! You must
+# click "Shutdown", wait 11 minutes, then start i2p.
+#
 wrapper.java.maxmemory=128
 
 # Application parameters.  Add parameters as needed starting from 1

news.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2007-10-07 22:09:35 $">
- <i2p.release version="0.6.1.30" date="2007/02/15" minVersion="0.6"
+<i2p.news date="$Date: 2008-02-10 15:00:00 $">
+ <i2p.release version="0.6.1.31" date="2008/02/10" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
@@ -9,12 +9,104 @@
             publicurl="http://dev.i2p.net/pipermail/i2p/2005-July/000826.html"
             anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
             publiclogs="http://www.i2p.net/meeting141" />
+<p>
 &#149;
-2007-10-07: 0.6.1.30
-<a href="http://dev.i2p/pipermail/i2p/2007-October/001356.html">released</a>
-with
-streaming lib, eepget, and i2psnark improvements, and a memory leak fix.
+2008-02-10: <b>0.6.1.31 released</b>
+</p><p>
+The transitional 0.6.1.31 release will make the I2P
+release process independent of jrandom and *.i2p.net servers,
+introducing two new update verification keys, adding support
+for distributed update hosting inside I2P, and changing many URLs.
+</p><p>
+It introduces version 2 of the SAM protocol,
+along with substantial improvements to the address book,
+I2PSnark and ircproxy. Unless you have already done that,
+read about the update procedure below.
+</p>
+
+<p>
+&#149;
+2008-02-05: <b>Upcoming 0.6.1.31 Release</b>
+</p><p>
+And, since i2p's lead developer
+<a href="http://dreamtheaterfan.i2p/jrandom-awol.html">has gone AWOL</a>,
+we do not have his update signing key or write access to
+<a href="http://www.i2p/">www.i2p</a> or
+<a href="http://dev.i2p/">dev.i2p</a>.
+Complication and zzz have generated new signing keys, and they and Amiga are providing
+update file hosting. These changes must be configured in your router to take effect.
+</p><p>
+Make the following configuration changes and your router will automatically install
+the upcoming 0.6.1.31 release when it becomes available.
+The release will include SAM v2, new jump server links, and addressbook, IRC proxy, and i2psnark improvements.
+</p><p>
+We recommend the automated process as it will verify the key of the signed update file.
+If you do not make these changes,
+you will still be able to manually download the new i2pupdate.zip file from locations to
+be announced.
+<ol><li>
+On
+<a href="configupdate.jsp">configupdate.jsp</a>:
+</li><ol type="a"><li>
+Change the News URL to: http://complication.i2p/news.xml
+</li><li>
+Select ONE of the following new Update URLs at random and enter it into the Update URL box: 
+<br />http://amiga.i2p/i2p/i2pupdate.sud
+<br />http://complication.i2p/i2p/i2pupdate.sud
+<br />http://stats.i2p/i2p/i2pupdate.sud
+</li><li>
+Check the box "Update through the eepProxy?"
+</li><li>
+Click "Save"
+</li></ol>
+<li>
+On
+<a href="configadvanced.jsp">configadvanced.jsp</a>:
+<ol type="a"><li>
+Add the following line:
 <br />
+<textarea rows="1" cols="80" readonly="readonly">router.trustedUpdateKeys=W4kJbnv9KSVwbnapV7SaNW2kMIZKs~hwL0ro9pZXFo1xTwqz45nykCp1HM7sAKYDZay5z1HvYYOl9CNVz00xF03KPU9RUCVxhDZ1YXhZIskPKjUPUsCIpE~Z1C~N9KSEV6~2stDlBNH10VZ4T0X1TrcXwb3IBXliWo2y2GAx~Ow=,lT54eq3SH0TWWwQ1wgH6XPelIno7wH7UfiZOpQg-ZuxdNhc4UjjrohKdKZqfswt1ANPnmOlMewLGBESl7kJB9c5sByz~IOlNyz5BMLRC~R~ZC9QI4WXwUBYW8BhYO2mkvtdOrcy690lDkwzdf5xLxlCBpQlTaLYzQVjVWBcvbCA=,JHFA0yXUgKtmhajXFZH9Nk62OPRHbvvQHTi8EANV-D~3tjLjaz9p9cs6Fs8W3FSLfUwsQeFg7dfVSQQZga~1jMjboo94vIcm3j6XbW4mbcorVQ74uPjd8EA1AQhJ6bBTxDAFk~6fVDOdhHT0Wo5CcUn7v8bAYY3x3UWiL8Remx0=</textarea>
+</li><li>
+Click "Apply"
+</li></ol>
+<li>
+You are now ready to automatically receive the 0.6.1.31 update when it becomes available,
+either by setting your update policy to "download and install" or by clicking on the
+"update available" link when it appears.
+</li></li></ol>
+</p><p>
+If you would like to verify the trusted update keys, they are also
+<a href="http://stats.i2p/i2p/signingkeys.html">posted and signed here</a>.
+</p><p>
+The new release will be announced here, on
+<a href="http://forum.i2p/">the forums</a>, on IRC, and on Syndie.
+New users may install 0.6.1.31 from the
+<a href="http://www.i2p2.de/download">www.i2p2.de download page</a>.
+Thank you for your support during this transition. For help please contact us on #i2p.
+</p><p>
+Amiga, Complication, welterde, zzz
+</p>
+
+<p>
+&#149;
+2008-02-05: <b>*.i2p[.net] Replacements</b>
+<p>
+As you probably know, <a href="http://www.i2p.net/">www.i2p.net</a>
+and its related sites and services went down January 13 after
+a power outage at the hosting facility, and did not return fully to service.
+While some pages are still available at
+<a href="http://66.111.51.110/">66.111.51.110</a>
+we have a new official site at
+<a href="http://www.i2p2.de/">www.i2p2.de</a>
+and
+<a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>.
+Extensive information about replacements for the various services
+is available at
+<a href="http://forum.i2p/viewtopic.php?t=2500">the forums</a>,
+<a href="http://complication.i2p/">complication.i2p</a>, and
+<a href="http://zzz.i2p/">zzz.i2p</a>.
+</p>
+
 <!--
 &#149;
 2007-04-10:

readme.html

@@ -14,10 +14,10 @@ you can:</p>
          <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> and
              <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: sites tracking active eepsites</li>
          <li><a href="http://forum.i2p/">forum.i2p</a>: a secure and anonymous connection to <a href="http://forum.i2p.net/">forum.i2p.net</a></li>
-         <li><a href="http://www.i2p/">www.i2p</a>: a secure and anonymous connection to <a href="http://www.i2p.net/">www.i2p.net</a></li>
+         <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> and mirror <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>:
+              secure and anonymous connections to <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
          <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: an anonymously hosted search engine of eepsites</li>
          <li><a href="http://ugha.i2p/">ugha.i2p</a>: ugha's eepsite, a wiki that anyone can edit, and lots of links</li>
-         <li><a href="http://dev.i2p/">dev.i2p</a>: a secure and anonymous connection to <a href="http://dev.i2p.net/">dev.i2p.net</a></li>
          <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: Freenet proxy</li>
      </ul>
      There are many more eepsites - just follow the links from the ones you see,
@@ -55,10 +55,10 @@ Detailed instructions for starting your eepsite are on
 <p>Be patient - I2P may be slow to start the first time as it searches for peers.
 If, after 30 minutes, your Active: connected/recent count has less than 10 connected
 peers, you should open port 8887 on your firewall for better connectivity.
-If you cannot see any eepsites at all (even <a href="http://www.i2p">www.i2p</a>),
+If you cannot see any eepsites at all (even <a href="http://www.i2p2.i2p">www.i2p2.i2p</a>),
 be sure your browser proxy is set to localhost port 4444.
 You may also want to review the information on the 
-<a href="http://www.i2p.net/">I2P website</a>, post up messages to the 
+<a href="http://www.i2p2.i2p/">I2P website</a>, post up messages to the 
 <a href="http://forum.i2p.net/">I2P discussion forum</a>, or swing by #i2p or
 #i2p-chat on IRC at <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a>, irc.postman.i2p or irc.freshcoffee.i2p (they're linked together).</p>
 

router/java/src/net/i2p/router/RouterVersion.java

@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.548 $ $Date: 2008-01-08 21:15:43 $";
-    public final static String VERSION = "0.6.1.30";
-    public final static long BUILD = 20;
+    public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $";
+    public final static String VERSION = "0.6.1.31";
+    public final static long BUILD = 0;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);