From aa18ef23625e8151062adafc88bf6285f13b92f6 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 15 Nov 2008 16:12:21 +0000
Subject: [PATCH] updates

---
 www.i2p2/pages/announcements.html    | 129 ++++++++++++++-------------
 www.i2p2/pages/announcements_de.html | 129 ++++++++++++++-------------
 www.i2p2/pages/licenses.html         |  59 +++++++++---
 www.i2p2/pages/newdevelopers.html    |   6 ++
 www.i2p2/pages/roadmap.html          |   2 +-
 www.i2p2/pages/streaming.html        |  89 +++++++++++-------
 6 files changed, 244 insertions(+), 170 deletions(-)

diff --git a/www.i2p2/pages/announcements.html b/www.i2p2/pages/announcements.html
index 78c1fa52..9d76024a 100644
--- a/www.i2p2/pages/announcements.html
+++ b/www.i2p2/pages/announcements.html
@@ -14,84 +14,85 @@
 <h4>2007</h4>
 <ul>
 <li>2007-10-07 - <a href="release-0.6.1.30.html">0.6.1.30</a></li>
-<li>2007-08-29 - <a href="http://dev.i2p.net/pipermail/i2p/2007-August/001346.html">0.6.1.29</a></li>
-<li>2007-03-17 - <a href="http://dev.i2p.net/pipermail/i2p/2007-March/001340.html">0.6.1.28</a></li>
-<li>2007-02-15 - <a href="http://dev.i2p.net/pipermail/i2p/2007-February/001335.html">0.6.1.27</a></li>
+<li>2007-08-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=2263">0.6.1.29</a></li>
+<li>2007-03-17 - <a href="http://forum.i2p2.de/viewtopic.php?t=2074">0.6.1.28</a></li>
+<li>2007-02-15 - <a href="http://forum.i2p2.de/viewtopic.php?t=2045">0.6.1.27</a></li>
 </ul>
 <h4>2006</h4>
 <ul>
-<li>2006-10-09 - <a href="http://dev.i2p.net/pipermail/i2p/2006-October/001312.html">0.6.1.26</a></li>
-<li>2006-09-09 - <a href="http://dev.i2p.net/pipermail/i2p/2006-September/001306.html">0.6.1.25</a></li>
-<li>2006-07-29 - <a href="http://dev.i2p.net/pipermail/i2p/2006-July/001303.html">0.6.1.24</a></li>
-<li>2006-07-28 - <a href="http://dev.i2p.net/pipermail/i2p/2006-July/001301.html">0.6.1.23</a></li>
-<li>2006-07-18 - <a href="http://dev.i2p.net/pipermail/i2p/2006-July/001300.html">0.6.1.22</a></li>
-<li>2006-06-14 - <a href="http://dev.i2p.net/pipermail/i2p/2006-June/001294.html">0.6.1.21</a></li>
-<li>2006-06-04 - <a href="http://dev.i2p.net/pipermail/i2p/2006-June/001292.html">0.6.1.20</a></li>
-<li>2006-05-09 - <a href="http://dev.i2p.net/pipermail/i2p/2006-May/001287.html">0.6.1.18</a></li>
-<li>2006-04-23 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001282.html">0.6.1.17</a></li>
-<li>2006-04-15 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001280.html">0.6.1.16</a></li>
-<li>2006-04-13 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001279.html">0.6.1.15</a></li>
-<li>2006-04-05 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001276.html">0.6.1.14</a></li>
-<li>2006-03-26 - <a href="http://dev.i2p.net/pipermail/i2p/2006-March/001272.html">0.6.1.13</a></li>
-<li>2006-02-27 - <a href="http://dev.i2p.net/pipermail/i2p/2006-February/001265.html">0.6.1.12</a></li>
-<li>2006-02-21 - <a href="http://dev.i2p.net/pipermail/i2p/2006-February/001263.html">0.6.1.11</a></li>
-<li>2006-02-16 - <a href="http://dev.i2p.net/pipermail/i2p/2006-February/001261.html">0.6.1.10</a></li>
-<li>2006-01-12 - <a href="http://dev.i2p.net/pipermail/i2p/2006-January/001249.html">0.6.1.9</a></li>
+<li>2006-10-09 - <a href="http://forum.i2p2.de/viewtopic.php?t=1919">0.6.1.26</a></li>
+<li>2006-09-09 - <a href="http://forum.i2p2.de/viewtopic.php?t=1888">0.6.1.25</a></li>
+<li>2006-07-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1812">0.6.1.24</a></li>
+<li>2006-07-28 - <a href="http://forum.i2p2.de/viewtopic.php?t=1801">0.6.1.23</a></li>
+<li>2006-07-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=1785">0.6.1.22</a></li>
+<li>2006-06-14 - <a href="http://forum.i2p2.de/viewtopic.php?t=1743">0.6.1.21</a></li>
+<li>2006-06-04 - <a href="http://forum.i2p2.de/viewtopic.php?t=1730">0.6.1.20</a></li>
+<li>2006-05-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1706">0.6.1.19</a></li>
+<li>2006-05-09 - <a href="http://forum.i2p2.de/viewtopic.php?t=1691">0.6.1.18</a></li>
+<li>2006-04-23 - <a href="http://forum.i2p2.de/viewtopic.php?t=1670">0.6.1.17</a></li>
+<li>2006-04-15 - <a href="http://forum.i2p2.de/viewtopic.php?t=1664">0.6.1.16</a></li>
+<li>2006-04-13 - <a href="http://forum.i2p2.de/viewtopic.php?t=1661">0.6.1.15</a></li>
+<li>2006-04-05 - <a href="http://forum.i2p2.de/viewtopic.php?t=1636">0.6.1.14</a></li>
+<li>2006-03-26 - <a href="http://forum.i2p2.de/viewtopic.php?t=1612">0.6.1.13</a></li>
+<li>2006-02-27 - <a href="http://forum.i2p2.de/viewtopic.php?t=1558">0.6.1.12</a></li>
+<li>2006-02-21 - <a href="http://forum.i2p2.de/viewtopic.php?t=1533">0.6.1.11</a></li>
+<li>2006-02-16 - <a href="http://forum.i2p2.de/viewtopic.php?t=1512">0.6.1.10</a></li>
+<li>2006-01-12 - <a href="http://forum.i2p2.de/viewtopic.php?t=1402">0.6.1.9</a></li>
 </ul>
 <h4>2005</h4>
 <ul>
-<li>2005-12-22 - <a href="http://dev.i2p.net/pipermail/i2p/2005-December/001241.html">0.6.1.8</a></li>
-<li>2005-12-01 - <a href="http://dev.i2p.net/pipermail/i2p/2005-December/001235.html">0.6.1.7</a></li>
-<li>2005-11-26 - <a href="http://dev.i2p.net/pipermail/i2p/2005-November/001233.html">0.6.1.6</a></li>
-<li>2005-11-15 - <a href="http://dev.i2p.net/pipermail/i2p/2005-November/001212.html">0.6.1.5</a></li>
-<li>2005-10-29 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/001163.html">0.6.1.4</a></li>
-<li>2005-10-14 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/000999.html">0.6.1.3</a></li>
-<li>2005-10-07 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/000980.html">0.6.1.2</a></li>
-<li>2005-10-01 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/000938.html">0.6.1.1</a></li>
-<li>2005-09-29 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000935.html">0.6.1</a></li>
-<li>2005-09-17 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000919.html">0.6.0.6</a></li>
-<li>2005-09-02 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000882.html">0.6.0.5</a></li>
-<li>2005-09-01 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000880.html">0.6.0.4</a></li>
-<li>2005-08-21 - <a href="http://dev.i2p.net/pipermail/i2p/2005-August/000844.html">0.6.0.3</a></li>
-<li>2005-08-08 - <a href="http://dev.i2p.net/pipermail/i2p/2005-August/000834.html">0.6.0.2</a></li>
-<li>2005-08-03 - <a href="http://dev.i2p.net/pipermail/i2p/2005-August/000827.html">0.6.0.1</a></li>
-<li>2005-07-27 - <a href="http://dev.i2p.net/pipermail/i2p/2005-July/000824.html">0.6</a></li>
-<li>2005-04-20 - <a href="http://dev.i2p.net/pipermail/i2p/2005-April/000709.html">0.5.0.7</a></li>
-<li>2005-04-06 - <a href="http://dev.i2p.net/pipermail/i2p/2005-April/000676.html">0.5.0.6</a></li>
-<li>2005-03-29 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000662.html">0.5.0.5</a></li>
-<li>2005-03-24 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000656.html">0.5.0.4</a></li>
-<li>2005-03-18 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000652.html">0.5.0.3</a></li>
-<li>2005-03-06 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000618.html">0.5.0.2</a></li>
-<li>2005-02-23 - <a href="http://dev.i2p.net/pipermail/i2p/2005-February/000597.html">0.5.0.1</a></li>
-<li>2005-02-18 - <a href="http://dev.i2p.net/pipermail/i2p/2005-February/000585.html">0.5</a></li>
-<li>2005-01-06 - <a href="http://dev.i2p.net/pipermail/i2p/2005-January/000542.html">0.4.2.6</a></li>
+<li>2005-12-22 - <a href="http://forum.i2p2.de/viewtopic.php?t=1339">0.6.1.8</a></li>
+<li>2005-12-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=1257">0.6.1.7</a></li>
+<li>2005-11-26 - <a href="http://forum.i2p2.de/viewtopic.php?t=1238">0.6.1.6</a></li>
+<li>2005-11-15 - <a href="http://forum.i2p2.de/viewtopic.php?t=1206">0.6.1.5</a></li>
+<li>2005-10-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1144">0.6.1.4</a></li>
+<li>2005-10-14 - <a href="http://forum.i2p2.de/viewtopic.php?t=1098">0.6.1.3</a></li>
+<li>2005-10-07 - <a href="http://forum.i2p2.de/viewtopic.php?t=1068">0.6.1.2</a></li>
+<li>2005-10-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=1048">0.6.1.1</a></li>
+<li>2005-09-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1037">0.6.1</a></li>
+<li>2005-09-17 - <a href="http://forum.i2p2.de/viewtopic.php?t=999">0.6.0.6</a></li>
+<li>2005-09-02 - <a href="http://forum.i2p2.de/viewtopic.php?t=953">0.6.0.5</a></li>
+<li>2005-09-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=948">0.6.0.4</a></li>
+<li>2005-08-21 - <a href="http://forum.i2p2.de/viewtopic.php?t=910">0.6.0.3</a></li>
+<li>2005-08-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=875">0.6.0.2</a></li>
+<li>2005-08-03 - <a href="http://forum.i2p2.de/viewtopic.php?t=858">0.6.0.1</a></li>
+<li>2005-07-27 - <a href="http://forum.i2p2.de/viewtopic.php?t=828">0.6</a></li>
+<li>2005-04-20 - <a href="http://forum.i2p2.de/viewtopic.php?t=662">0.5.0.7</a></li>
+<li>2005-04-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=612">0.5.0.6</a></li>
+<li>2005-03-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=592">0.5.0.5</a></li>
+<li>2005-03-24 - <a href="http://forum.i2p2.de/viewtopic.php?t=572">0.5.0.4</a></li>
+<li>2005-03-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=553">0.5.0.3</a></li>
+<li>2005-03-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=413">0.5.0.2</a></li>
+<li>2005-02-23 - <a href="http://forum.i2p2.de/viewtopic.php?t=367">0.5.0.1</a></li>
+<li>2005-02-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=361">0.5</a></li>
+<li>2005-01-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=236">0.4.2.6</a></li>
 </ul>
 <h4>2004</h4>
 <ul>
 <li>2004-12-21 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000527.html">0.4.2.5</a></li>
 <li>2004-12-18 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000525.html">0.4.2.4</a></li>
-<li>2004-12-08 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000512.html">0.4.2.3</a></li>
+<li>2004-12-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=195">0.4.2.3</a></li>
 <li>2004-12-01 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000494.html">0.4.2.2</a></li>
 <li>2004-12-01 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000493.html">0.4.2.1</a></li>
-<li>2004-11-26 - <a href="http://dev.i2p.net/pipermail/i2p/2004-November/000491.html">0.4.2</a></li>
-<li>2004-11-06 - <a href="http://dev.i2p.net/pipermail/i2p/2004-November/000484.html">0.4.1.4</a></li>
-<li>2004-10-18 - <a href="http://dev.i2p.net/pipermail/i2p/2004-October/000468.html">0.4.1.3</a></li>
-<li>2004-10-10 - <a href="http://dev.i2p.net/pipermail/i2p/2004-October/000464.html">0.4.1.2</a></li>
-<li>2004-10-01 - <a href="http://dev.i2p.net/pipermail/i2p/2004-October/000458.html">0.4.1.1</a></li>
-<li>2004-09-30 - <a href="http://dev.i2p.net/pipermail/i2p/2004-September/000456.html">0.4.1</a></li>
-<li>2004-09-08 - <a href="http://dev.i2p.net/pipermail/i2p/2004-September/000440.html">0.4.0.1</a></li>
-<li>2004-09-03 - <a href="http://dev.i2p.net/pipermail/i2p/2004-September/000428.html">0.4</a></li>
-<li>2004-08-20 - <a href="http://dev.i2p.net/pipermail/i2p/2004-August/000416.html">0.3.4.3</a></li>
-<li>2004-08-12 - <a href="http://dev.i2p.net/pipermail/i2p/2004-August/000405.html">0.3.4.2</a></li>
-<li>2004-08-08 - <a href="http://dev.i2p.net/pipermail/i2p/2004-August/000398.html">0.3.4.1</a></li>
-<li>2004-07-29 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000377.html">0.3.4</a></li>
+<li>2004-11-26 - <a href="http://forum.i2p2.de/viewtopic.php?t=176">0.4.2</a></li>
+<li>2004-11-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=143">0.4.1.4</a></li>
+<li>2004-10-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=124">0.4.1.3</a></li>
+<li>2004-10-10 - <a href="http://forum.i2p2.de/viewtopic.php?t=113">0.4.1.2</a></li>
+<li>2004-10-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=100">0.4.1.1</a></li>
+<li>2004-09-30 - <a href="http://forum.i2p2.de/viewtopic.php?t=97">0.4.1</a></li>
+<li>2004-09-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=70">0.4.0.1</a></li>
+<li>2004-09-03 - <a href="http://forum.i2p2.de/viewtopic.php?t=60">0.4</a></li>
+<li>2004-08-20 - <a href="http://forum.i2p2.de/viewtopic.php?t=51">0.3.4.3</a></li>
+<li>2004-08-12 - <a href="http://forum.i2p2.de/viewtopic.php?t=45">0.3.4.2</a></li>
+<li>2004-08-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=42">0.3.4.1</a></li>
+<li>2004-07-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=36">0.3.4</a></li>
 <li>2004-07-23 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000363.html">0.3.3</a></li>
-<li>2004-07-16 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000341.html">0.3.2.3</a></li>
-<li>2004-07-14 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000331.html">0.3.2.2</a></li>
-<li>2004-07-11 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000327.html">0.3.2.1</a></li>
-<li>2004-07-07 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000313.html">0.3.2</a></li>
-<li>2004-06-25 - <a href="http://dev.i2p.net/pipermail/i2p/2004-June/000289.html">0.3.1.5</a></li>
-<li>2004-05-23 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000241.html">0.3.1.4</a></li>
+<li>2004-07-16 - <a href="http://forum.i2p2.de/viewtopic.php?t=28">0.3.2.3</a></li>
+<li>2004-07-14 - <a href="http://forum.i2p2.de/viewtopic.php?t=27">0.3.2.2</a></li>
+<li>2004-07-11 - <a href="http://forum.i2p2.de/viewtopic.php?t=22">0.3.2.1</a></li>
+<li>2004-07-07 - <a href="http://forum.i2p2.de/viewtopic.php?t=20">0.3.2</a></li>
+<li>2004-06-25 - <a href="http://forum.i2p2.de/viewtopic.php?t=6">0.3.1.5</a></li>
+<li>2004-05-23 - <a href="http://forum.i2p2.de/viewtopic.php?t=2">0.3.1.4</a></li>
 <li>2004-05-20 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000240.html">0.3.1.3</a></li>
 <li>2004-05-13 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000238.html">0.3.1.2</a></li>
 <li>2004-05-07 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000235.html">0.3.1.1</a></li>
diff --git a/www.i2p2/pages/announcements_de.html b/www.i2p2/pages/announcements_de.html
index f26a50b1..975004c7 100644
--- a/www.i2p2/pages/announcements_de.html
+++ b/www.i2p2/pages/announcements_de.html
@@ -15,84 +15,85 @@
 <h4>2007</h4>
 <ul>
 <li>2007-10-07 - <a href="release-0.6.1.30.html">0.6.1.30</a></li>
-<li>2007-08-29 - <a href="http://dev.i2p.net/pipermail/i2p/2007-August/001346.html">0.6.1.29</a></li>
-<li>2007-03-17 - <a href="http://dev.i2p.net/pipermail/i2p/2007-March/001340.html">0.6.1.28</a></li>
-<li>2007-02-15 - <a href="http://dev.i2p.net/pipermail/i2p/2007-February/001335.html">0.6.1.27</a></li>
+<li>2007-08-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=2263">0.6.1.29</a></li>
+<li>2007-03-17 - <a href="http://forum.i2p2.de/viewtopic.php?t=2074">0.6.1.28</a></li>
+<li>2007-02-15 - <a href="http://forum.i2p2.de/viewtopic.php?t=2045">0.6.1.27</a></li>
 </ul>
 <h4>2006</h4>
 <ul>
-<li>2006-10-09 - <a href="http://dev.i2p.net/pipermail/i2p/2006-October/001312.html">0.6.1.26</a></li>
-<li>2006-09-09 - <a href="http://dev.i2p.net/pipermail/i2p/2006-September/001306.html">0.6.1.25</a></li>
-<li>2006-07-29 - <a href="http://dev.i2p.net/pipermail/i2p/2006-July/001303.html">0.6.1.24</a></li>
-<li>2006-07-28 - <a href="http://dev.i2p.net/pipermail/i2p/2006-July/001301.html">0.6.1.23</a></li>
-<li>2006-07-18 - <a href="http://dev.i2p.net/pipermail/i2p/2006-July/001300.html">0.6.1.22</a></li>
-<li>2006-06-14 - <a href="http://dev.i2p.net/pipermail/i2p/2006-June/001294.html">0.6.1.21</a></li>
-<li>2006-06-04 - <a href="http://dev.i2p.net/pipermail/i2p/2006-June/001292.html">0.6.1.20</a></li>
-<li>2006-05-09 - <a href="http://dev.i2p.net/pipermail/i2p/2006-May/001287.html">0.6.1.18</a></li>
-<li>2006-04-23 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001282.html">0.6.1.17</a></li>
-<li>2006-04-15 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001280.html">0.6.1.16</a></li>
-<li>2006-04-13 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001279.html">0.6.1.15</a></li>
-<li>2006-04-05 - <a href="http://dev.i2p.net/pipermail/i2p/2006-April/001276.html">0.6.1.14</a></li>
-<li>2006-03-26 - <a href="http://dev.i2p.net/pipermail/i2p/2006-March/001272.html">0.6.1.13</a></li>
-<li>2006-02-27 - <a href="http://dev.i2p.net/pipermail/i2p/2006-February/001265.html">0.6.1.12</a></li>
-<li>2006-02-21 - <a href="http://dev.i2p.net/pipermail/i2p/2006-February/001263.html">0.6.1.11</a></li>
-<li>2006-02-16 - <a href="http://dev.i2p.net/pipermail/i2p/2006-February/001261.html">0.6.1.10</a></li>
-<li>2006-01-12 - <a href="http://dev.i2p.net/pipermail/i2p/2006-January/001249.html">0.6.1.9</a></li>
+<li>2006-10-09 - <a href="http://forum.i2p2.de/viewtopic.php?t=1919">0.6.1.26</a></li>
+<li>2006-09-09 - <a href="http://forum.i2p2.de/viewtopic.php?t=1888">0.6.1.25</a></li>
+<li>2006-07-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1812">0.6.1.24</a></li>
+<li>2006-07-28 - <a href="http://forum.i2p2.de/viewtopic.php?t=1801">0.6.1.23</a></li>
+<li>2006-07-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=1785">0.6.1.22</a></li>
+<li>2006-06-14 - <a href="http://forum.i2p2.de/viewtopic.php?t=1743">0.6.1.21</a></li>
+<li>2006-06-04 - <a href="http://forum.i2p2.de/viewtopic.php?t=1730">0.6.1.20</a></li>
+<li>2006-05-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1706">0.6.1.19</a></li>
+<li>2006-05-09 - <a href="http://forum.i2p2.de/viewtopic.php?t=1691">0.6.1.18</a></li>
+<li>2006-04-23 - <a href="http://forum.i2p2.de/viewtopic.php?t=1670">0.6.1.17</a></li>
+<li>2006-04-15 - <a href="http://forum.i2p2.de/viewtopic.php?t=1664">0.6.1.16</a></li>
+<li>2006-04-13 - <a href="http://forum.i2p2.de/viewtopic.php?t=1661">0.6.1.15</a></li>
+<li>2006-04-05 - <a href="http://forum.i2p2.de/viewtopic.php?t=1636">0.6.1.14</a></li>
+<li>2006-03-26 - <a href="http://forum.i2p2.de/viewtopic.php?t=1612">0.6.1.13</a></li>
+<li>2006-02-27 - <a href="http://forum.i2p2.de/viewtopic.php?t=1558">0.6.1.12</a></li>
+<li>2006-02-21 - <a href="http://forum.i2p2.de/viewtopic.php?t=1533">0.6.1.11</a></li>
+<li>2006-02-16 - <a href="http://forum.i2p2.de/viewtopic.php?t=1512">0.6.1.10</a></li>
+<li>2006-01-12 - <a href="http://forum.i2p2.de/viewtopic.php?t=1402">0.6.1.9</a></li>
 </ul>
 <h4>2005</h4>
 <ul>
-<li>2005-12-22 - <a href="http://dev.i2p.net/pipermail/i2p/2005-December/001241.html">0.6.1.8</a></li>
-<li>2005-12-01 - <a href="http://dev.i2p.net/pipermail/i2p/2005-December/001235.html">0.6.1.7</a></li>
-<li>2005-11-26 - <a href="http://dev.i2p.net/pipermail/i2p/2005-November/001233.html">0.6.1.6</a></li>
-<li>2005-11-15 - <a href="http://dev.i2p.net/pipermail/i2p/2005-November/001212.html">0.6.1.5</a></li>
-<li>2005-10-29 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/001163.html">0.6.1.4</a></li>
-<li>2005-10-14 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/000999.html">0.6.1.3</a></li>
-<li>2005-10-07 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/000980.html">0.6.1.2</a></li>
-<li>2005-10-01 - <a href="http://dev.i2p.net/pipermail/i2p/2005-October/000938.html">0.6.1.1</a></li>
-<li>2005-09-29 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000935.html">0.6.1</a></li>
-<li>2005-09-17 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000919.html">0.6.0.6</a></li>
-<li>2005-09-02 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000882.html">0.6.0.5</a></li>
-<li>2005-09-01 - <a href="http://dev.i2p.net/pipermail/i2p/2005-September/000880.html">0.6.0.4</a></li>
-<li>2005-08-21 - <a href="http://dev.i2p.net/pipermail/i2p/2005-August/000844.html">0.6.0.3</a></li>
-<li>2005-08-08 - <a href="http://dev.i2p.net/pipermail/i2p/2005-August/000834.html">0.6.0.2</a></li>
-<li>2005-08-03 - <a href="http://dev.i2p.net/pipermail/i2p/2005-August/000827.html">0.6.0.1</a></li>
-<li>2005-07-27 - <a href="http://dev.i2p.net/pipermail/i2p/2005-July/000824.html">0.6</a></li>
-<li>2005-04-20 - <a href="http://dev.i2p.net/pipermail/i2p/2005-April/000709.html">0.5.0.7</a></li>
-<li>2005-04-06 - <a href="http://dev.i2p.net/pipermail/i2p/2005-April/000676.html">0.5.0.6</a></li>
-<li>2005-03-29 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000662.html">0.5.0.5</a></li>
-<li>2005-03-24 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000656.html">0.5.0.4</a></li>
-<li>2005-03-18 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000652.html">0.5.0.3</a></li>
-<li>2005-03-06 - <a href="http://dev.i2p.net/pipermail/i2p/2005-March/000618.html">0.5.0.2</a></li>
-<li>2005-02-23 - <a href="http://dev.i2p.net/pipermail/i2p/2005-February/000597.html">0.5.0.1</a></li>
-<li>2005-02-18 - <a href="http://dev.i2p.net/pipermail/i2p/2005-February/000585.html">0.5</a></li>
-<li>2005-01-06 - <a href="http://dev.i2p.net/pipermail/i2p/2005-January/000542.html">0.4.2.6</a></li>
+<li>2005-12-22 - <a href="http://forum.i2p2.de/viewtopic.php?t=1339">0.6.1.8</a></li>
+<li>2005-12-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=1257">0.6.1.7</a></li>
+<li>2005-11-26 - <a href="http://forum.i2p2.de/viewtopic.php?t=1238">0.6.1.6</a></li>
+<li>2005-11-15 - <a href="http://forum.i2p2.de/viewtopic.php?t=1206">0.6.1.5</a></li>
+<li>2005-10-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1144">0.6.1.4</a></li>
+<li>2005-10-14 - <a href="http://forum.i2p2.de/viewtopic.php?t=1098">0.6.1.3</a></li>
+<li>2005-10-07 - <a href="http://forum.i2p2.de/viewtopic.php?t=1068">0.6.1.2</a></li>
+<li>2005-10-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=1048">0.6.1.1</a></li>
+<li>2005-09-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=1037">0.6.1</a></li>
+<li>2005-09-17 - <a href="http://forum.i2p2.de/viewtopic.php?t=999">0.6.0.6</a></li>
+<li>2005-09-02 - <a href="http://forum.i2p2.de/viewtopic.php?t=953">0.6.0.5</a></li>
+<li>2005-09-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=948">0.6.0.4</a></li>
+<li>2005-08-21 - <a href="http://forum.i2p2.de/viewtopic.php?t=910">0.6.0.3</a></li>
+<li>2005-08-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=875">0.6.0.2</a></li>
+<li>2005-08-03 - <a href="http://forum.i2p2.de/viewtopic.php?t=858">0.6.0.1</a></li>
+<li>2005-07-27 - <a href="http://forum.i2p2.de/viewtopic.php?t=828">0.6</a></li>
+<li>2005-04-20 - <a href="http://forum.i2p2.de/viewtopic.php?t=662">0.5.0.7</a></li>
+<li>2005-04-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=612">0.5.0.6</a></li>
+<li>2005-03-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=592">0.5.0.5</a></li>
+<li>2005-03-24 - <a href="http://forum.i2p2.de/viewtopic.php?t=572">0.5.0.4</a></li>
+<li>2005-03-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=553">0.5.0.3</a></li>
+<li>2005-03-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=413">0.5.0.2</a></li>
+<li>2005-02-23 - <a href="http://forum.i2p2.de/viewtopic.php?t=367">0.5.0.1</a></li>
+<li>2005-02-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=361">0.5</a></li>
+<li>2005-01-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=236">0.4.2.6</a></li>
 </ul>
 <h4>2004</h4>
 <ul>
 <li>2004-12-21 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000527.html">0.4.2.5</a></li>
 <li>2004-12-18 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000525.html">0.4.2.4</a></li>
-<li>2004-12-08 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000512.html">0.4.2.3</a></li>
+<li>2004-12-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=195">0.4.2.3</a></li>
 <li>2004-12-01 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000494.html">0.4.2.2</a></li>
 <li>2004-12-01 - <a href="http://dev.i2p.net/pipermail/i2p/2004-December/000493.html">0.4.2.1</a></li>
-<li>2004-11-26 - <a href="http://dev.i2p.net/pipermail/i2p/2004-November/000491.html">0.4.2</a></li>
-<li>2004-11-06 - <a href="http://dev.i2p.net/pipermail/i2p/2004-November/000484.html">0.4.1.4</a></li>
-<li>2004-10-18 - <a href="http://dev.i2p.net/pipermail/i2p/2004-October/000468.html">0.4.1.3</a></li>
-<li>2004-10-10 - <a href="http://dev.i2p.net/pipermail/i2p/2004-October/000464.html">0.4.1.2</a></li>
-<li>2004-10-01 - <a href="http://dev.i2p.net/pipermail/i2p/2004-October/000458.html">0.4.1.1</a></li>
-<li>2004-09-30 - <a href="http://dev.i2p.net/pipermail/i2p/2004-September/000456.html">0.4.1</a></li>
-<li>2004-09-08 - <a href="http://dev.i2p.net/pipermail/i2p/2004-September/000440.html">0.4.0.1</a></li>
-<li>2004-09-03 - <a href="http://dev.i2p.net/pipermail/i2p/2004-September/000428.html">0.4</a></li>
-<li>2004-08-20 - <a href="http://dev.i2p.net/pipermail/i2p/2004-August/000416.html">0.3.4.3</a></li>
-<li>2004-08-12 - <a href="http://dev.i2p.net/pipermail/i2p/2004-August/000405.html">0.3.4.2</a></li>
-<li>2004-08-08 - <a href="http://dev.i2p.net/pipermail/i2p/2004-August/000398.html">0.3.4.1</a></li>
-<li>2004-07-29 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000377.html">0.3.4</a></li>
+<li>2004-11-26 - <a href="http://forum.i2p2.de/viewtopic.php?t=176">0.4.2</a></li>
+<li>2004-11-06 - <a href="http://forum.i2p2.de/viewtopic.php?t=143">0.4.1.4</a></li>
+<li>2004-10-18 - <a href="http://forum.i2p2.de/viewtopic.php?t=124">0.4.1.3</a></li>
+<li>2004-10-10 - <a href="http://forum.i2p2.de/viewtopic.php?t=113">0.4.1.2</a></li>
+<li>2004-10-01 - <a href="http://forum.i2p2.de/viewtopic.php?t=100">0.4.1.1</a></li>
+<li>2004-09-30 - <a href="http://forum.i2p2.de/viewtopic.php?t=97">0.4.1</a></li>
+<li>2004-09-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=70">0.4.0.1</a></li>
+<li>2004-09-03 - <a href="http://forum.i2p2.de/viewtopic.php?t=60">0.4</a></li>
+<li>2004-08-20 - <a href="http://forum.i2p2.de/viewtopic.php?t=51">0.3.4.3</a></li>
+<li>2004-08-12 - <a href="http://forum.i2p2.de/viewtopic.php?t=45">0.3.4.2</a></li>
+<li>2004-08-08 - <a href="http://forum.i2p2.de/viewtopic.php?t=42">0.3.4.1</a></li>
+<li>2004-07-29 - <a href="http://forum.i2p2.de/viewtopic.php?t=36">0.3.4</a></li>
 <li>2004-07-23 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000363.html">0.3.3</a></li>
-<li>2004-07-16 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000341.html">0.3.2.3</a></li>
-<li>2004-07-14 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000331.html">0.3.2.2</a></li>
-<li>2004-07-11 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000327.html">0.3.2.1</a></li>
-<li>2004-07-07 - <a href="http://dev.i2p.net/pipermail/i2p/2004-July/000313.html">0.3.2</a></li>
-<li>2004-06-25 - <a href="http://dev.i2p.net/pipermail/i2p/2004-June/000289.html">0.3.1.5</a></li>
-<li>2004-05-23 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000241.html">0.3.1.4</a></li>
+<li>2004-07-16 - <a href="http://forum.i2p2.de/viewtopic.php?t=28">0.3.2.3</a></li>
+<li>2004-07-14 - <a href="http://forum.i2p2.de/viewtopic.php?t=27">0.3.2.2</a></li>
+<li>2004-07-11 - <a href="http://forum.i2p2.de/viewtopic.php?t=22">0.3.2.1</a></li>
+<li>2004-07-07 - <a href="http://forum.i2p2.de/viewtopic.php?t=20">0.3.2</a></li>
+<li>2004-06-25 - <a href="http://forum.i2p2.de/viewtopic.php?t=6">0.3.1.5</a></li>
+<li>2004-05-23 - <a href="http://forum.i2p2.de/viewtopic.php?t=2">0.3.1.4</a></li>
 <li>2004-05-20 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000240.html">0.3.1.3</a></li>
 <li>2004-05-13 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000238.html">0.3.1.2</a></li>
 <li>2004-05-07 - <a href="http://dev.i2p.net/pipermail/i2p/2004-May/000235.html">0.3.1.1</a></li>
diff --git a/www.i2p2/pages/licenses.html b/www.i2p2/pages/licenses.html
index 74fc734b..e9e2a34d 100644
--- a/www.i2p2/pages/licenses.html
+++ b/www.i2p2/pages/licenses.html
@@ -62,7 +62,7 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">jrandom</td>
+  <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
   <td valign="top" align="left"><b>I2P Router</b></td>
@@ -74,10 +74,10 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
 	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">jrandom</td>
+  <td valign="top" align="left">zzz</td>
  </tr>
  <tr>
-  <td valign="top" align="left"><b>ministreaming</b></td>
+  <td valign="top" align="left"><b>Ministreaming</b></td>
   <td valign="top" align="left">apps/ministreaming</td>
   <td valign="top" align="left">mstreaming.jar</td>
   <td valign="top" align="left">
@@ -88,6 +88,18 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
   <td valign="top" align="left">mihi</td>
  </tr>
+ <tr>
+  <td valign="top" align="left"><b>Streaming</b></td>
+  <td valign="top" align="left">apps/streaming</td>
+  <td valign="top" align="left">streaming.jar</td>
+  <td valign="top" align="left">
+	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
+  <td valign="top" align="left">
+	  <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
+    <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
+    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
+  <td valign="top" align="left">zzz</td>
+ </tr>
  <tr>
   <td valign="top" align="left"><b>I2PTunnel</b></td>
   <td valign="top" align="left">apps/i2ptunnel</td>
@@ -194,16 +206,43 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a></td>
   <td valign="top" align="left">Ragnarok</td>
  </tr>
+ <tr>
+  <td valign="top" align="left"><b>I2PSnark</b></td>
+  <td valign="top" align="left">apps/i2psnark</td>
+  <td valign="top" align="left">i2psnark.jar</td>
+  <td valign="top" align="left">
+	  <a href="#java_exception">GPL + exception</a></td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">zzz</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b>Susidns</b></td>
+  <td valign="top" align="left">apps/susidns</td>
+  <td valign="top" align="left">susidns.war</td>
+  <td valign="top" align="left">
+	  <a href="#java_exception">GPL + exception</a></td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">&nbsp;</td>
+ </tr>
+ <tr>
+  <td valign="top" align="left"><b>Susimail</b></td>
+  <td valign="top" align="left">apps/susimail</td>
+  <td valign="top" align="left">susimail.war</td>
+  <td valign="top" align="left">
+	  <a href="#java_exception">GPL + exception</a></td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">&nbsp;</td>
+ </tr>
  <tr>
   <td valign="top" align="left"><b>Other apps not mentioned</b></td>
   <td valign="top" align="left">apps/</td>
   <td valign="top" align="left">...</td>
   <td valign="top" align="left">
-	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a></td>
-  <td valign="top" align="left"><a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
-    <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
-    <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">jrandom</td>
+      probably
+	  <a href="http://en.wikipedia.org/wiki/Public_domain">Public domain</a>
+      but check the source</td>
+  <td valign="top" align="left">&nbsp;</td>
+  <td valign="top" align="left">&nbsp;</td>
  </tr>
  <tr>
   <td valign="top" align="left"><b>Installer</b></td>
@@ -216,14 +255,14 @@ to what licenses meet the above four guarantees for inclusion in the I2P distrib
     <a href="http://opensource.org/licenses/bsd-license.php">BSD</a><br />
     <a href="http://www.cryptix.org/LICENSE.TXT">Cryptix</a><br />
     <a href="http://opensource.org/licenses/mit-license.html">MIT</a></td>
-  <td valign="top" align="left">jrandom</td>
+  <td valign="top" align="left">&nbsp;</td>
  </tr>
 </table> 
 
 <h3><a id="java_exception">GPL + java exception</a></h3>
 <p>While it may be redundant, just for clarity the
 <a href="http://www.fsf.org/licenses/gpl.html">GPL</a>'ed code included within
-I2PTunnel must be released under the GPL with an additional "exception"
+I2PTunnel and other apps must be released under the GPL with an additional "exception"
 explicitly authorizing the use of Java's standard libraries:</p>
 
 <p><code>In addition, as a special exception, XXXX gives permission to link the
diff --git a/www.i2p2/pages/newdevelopers.html b/www.i2p2/pages/newdevelopers.html
index 495fca44..fa6b6db7 100644
--- a/www.i2p2/pages/newdevelopers.html
+++ b/www.i2p2/pages/newdevelopers.html
@@ -29,6 +29,12 @@ get the monotone source repository installed - short instructions:
 </ul>
 Long version: see the <a href="monotone.html">monotone page</a>.
 
+<li>
+To compile the code, you need the Sun Java SDK 1.5 or higher
+(or equivalent SDK) and
+<a href="http://ant.apache.org/">Apache ant</a>
+version 1.7.0 or higher.
+
 <li>
 For development on new applications,
 see the <a href="applications">application development guide</a>.
diff --git a/www.i2p2/pages/roadmap.html b/www.i2p2/pages/roadmap.html
index dc91d0b3..6e3aa163 100644
--- a/www.i2p2/pages/roadmap.html
+++ b/www.i2p2/pages/roadmap.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 <h2 id="0.7">0.7</h2>
-Late 2008
+Early 2009
 <ul>
 <li>Address several <a href="how_networkdatabase.html#todo">floodfill issues</a></li>
 <li>Research and improve the <a href="i2np.html">Message Priority System</a></li>
diff --git a/www.i2p2/pages/streaming.html b/www.i2p2/pages/streaming.html
index e04963cb..8f1b2e3d 100644
--- a/www.i2p2/pages/streaming.html
+++ b/www.i2p2/pages/streaming.html
@@ -21,7 +21,6 @@ off into its own library both to keep the TCP-esque complexities separate and to
 allow alternative optimized implemenations.</p>
 
 <h2>History</h2>
-<p><i>copied from the tech intro</i></p>
 <p>
 The streaming library has grown organically for I2P - first mihi implemented the
 "mini streaming library" as part of I2PTunnel, which was limited to a window
@@ -29,8 +28,9 @@ size of 1 message (requiring an ACK before sending the next one), and then it wa
 refactored out into a generic streaming interface (mirroring TCP sockets) and the
 full streaming implementation was deployed with a sliding window protocol and 
 optimizations to take into account the high bandwidth x delay product.  Individual
-streams may adjust the maximum packet size and other options, though the default
-of 4KB compressed seems a reasonable tradeoff between the bandwidth costs of 
+streams may adjust the maximum packet size and other options. The default
+message size is selected to fit precisely in two 1K I2NP tunnel messages,
+and is a reasonable tradeoff between the bandwidth costs of 
 retransmitting lost messages and the latency of multiple messages.
 </p>
 
@@ -39,11 +39,11 @@ In addition, in consideration of the relatively high cost of subsequent messages
 the streaming library's protocol for scheduling and delivering messages has been optimized to
 allow individual messages passed to contain as much information as is available.
 For instance, a small HTTP transaction proxied through the streaming library can
-be completed in a single round trip - the first message bundles a SYN, FIN, and
-the small payload (an HTTP request typically fits) and the reply bundles the SYN,
-FIN, ACK, and the small payload (many HTTP responses fit).  While an additional
+be completed in a single round trip - the first messages bundle a SYN, FIN, and
+the small HTTP request payload, and the reply bundles the SYN,
+FIN, ACK, and the HTTP response payload.  While an additional
 ACK must be transmitted to tell the HTTP server that the SYN/FIN/ACK has been
-received, the local HTTP proxy can deliver the full response to the browser 
+received, the local HTTP proxy can often deliver the full response to the browser 
 immediately.  
 </p>
 
@@ -84,8 +84,10 @@ it contains a full windowing implementation.
 <p>
 Significant tuning of the streaming lib parameters,
 greatly increasing outbound performance, was implemented in 0.6.1.28.
-After the changes in that release, the current default values
-in the implementation are listed below.
+Subsequent releases include additional tuning and bug fixes.
+The current default values are listed below.
+Lower case values are streaming lib parameters that can changed on a
+per-connection basis.
 These values are tuned for HTTP performance over typical I2P conditions. Other applications such
 as peer-to-peer services are strongly encouraged to
 modify as necessary, by setting the options and passing them via the call to
@@ -94,22 +96,27 @@ Time values are in ms.
 <ul>
 <li>MIN_RESEND_DELAY = 2*1000
 <li>MAX_RESEND_DELAY = 45*1000
-<li>DISCONNECT_TIMEOUT = 5*60*1000
-<li>INITIAL_RECEIVE_WINDOW = 1
-<li>INITIAL_WINDOW_SIZE = 12 // i2psnark sets to 1
+<li>i2p.streaming.connectTimeout = 5*60*1000
+<li>i2p.streaming.initialReceiveWindow = 1
+<li>i2p.streaming.initialWindowSize = 12
 <li>MIN_WINDOW_SIZE = 1
-<li>MAX_WINDOW_SIZE = 64
+<li>i2p.streaming.maxWindowSize = 128 // as of release 0.6.3 (was 64)
 <li>TREND_COUNT = 3
-<li>DEFAULT_MAX_SENDS = 8
-<li>RTT_DAMPENING = 0.9
-<li>PROFILE_BULK
-<li>MAX_MESSAGE_SIZE = 960 // 960 fits inside a single tunnel message
-<li>INITIAL_RTT = 10*1000
-<li>INITIAL_RESEND_DELAY = 1000
-<li>INITIAL_ACK_DELAY = 2000
-<li>INACTIVITY_TIMEOUT = 90*1000
-<li>CONGESTION_AVOIDANCE_GROWTH_RATE_FACTOR = 1
-<li>SLOW_START_GROWTH_RATE_FACTOR = 1
+<li>i2p.streaming.maxResends = 8
+<li>RTT_DAMPENING = 0.875 // as of release 0.6.5 (was 0.9)
+<li>i2p.streaming.profile = 1 (bulk) (2=interactive not suported)
+<li>MIN_MESSAGE_SIZE = 512 // as of release 0.6.5
+<li>i2p.streaming.maxMessageSize = 1730 // as of release 0.6.5 (was 960)
+<li>INBOUND_BUFFER_SIZE = maxMessageSize * (maxWindowSize + 2)
+<li>i2p.streaming.initialRTT = 10*1000
+<li>INITIAL_TIMEOUT = 1.5 * initialRTT
+<li>i2p.streaming.initialResendDelay = 1000
+<li>i2p.streaming.initialAckDelay = 2000
+<li>i2p.streaming.inactivityTimeout = 90*1000
+<li>i2p.streaming.inactivityAction = 2 (send) (0=noop, 1=disconnect)
+<li>i2p.streaming.congestionAvoidanceGrowthRateFactor = 1
+<li>i2p.streaming.slowStartGrowthRateFactor = 1
+<li>PASSIVE_FLUSH_DELAY = 250 // as of release 0.6.5 (was 500)
 </ul>
 </p>
 
@@ -119,6 +126,20 @@ phases. However, before the 0.6.1.33 release, window growth was substantially sl
 these issues were fixed in release 0.6.1.33.
 </p>
 
+<p>
+The maximum message size (also called the MTU / MRU) is negotiated to the lower value supported by
+the two peers. As tunnel messages are padded to 1KB, a poor MTU selection will lead to
+a large amount of overhead.
+The MTU is chosen to fit precisely in an integral number of 1K I2NP tunnel messages,
+including overhead for the typical case.
+The first message in a connection includes a 387 byte (typical) Destination added by the streaming layer,
+and usually a 898 byte (typical) LeaseSet bundled in the Garlic message.
+Therefore, the goal of fitting a complete HTTP request in a single 1KB I2NP message is not realistic.
+However, the selection of the MTU, together with careful implementation of fragmentation
+and batching strategies in the tunnel gateway procesor, are important factors in network bandwidth,
+latency, reliability, and efficiency, especially for long-lived connections.
+</p>
+
 <p>
 The interaction of the routing algorithms with the streaming lib strongly affects performance.
 In particular, random distribtion of messages to multiple tunnels in a pool
@@ -128,9 +149,8 @@ In release 0.6.1.30, the routing of messages to the outbound tunnels was made
 consistent, with pushback when a tunnel was backlogged.
 This had a significant positive impact on bandwidths.
 The pushback code was reverted in release 0.6.1.31 due to anonymity concerns.
-Consistent message routing to inbound tunnels is more difficult,
-as there is currently no tracking in the code of the message source.
-Perhaps to be implemented in 0.6.1.32.
+Consistent message routing to inbound tunnels
+was implemented in release 0.6.1.32.
 </p>
 
 <p>
@@ -144,8 +164,8 @@ See <a href="ntcp.html">the NTCP page</a> for a discussion.
 <p>
 Here is the format of a single packet transferred as part of a streaming connection.  
 <ul>
-<li>sendStreamId [4 byte value]</li>
-<li>receiveStreamId [4 byte value]</li>
+<li>sendStreamId [4 byte value] (random number selected by the connection recipient)</li>
+<li>receiveStreamId [4 byte value] (random number selected by the connection originator)</li>
 <li>sequenceNum [4 byte unsigned integer]</li>
 <li>ackThrough [4 byte unsigned integer]</li>
 <li>number of NACKs [1 byte unsigned integer]</li>
@@ -164,10 +184,10 @@ in the given order):</p><ol>
 <li>FLAG_SYNCHRONIZE: no option data</li>
 <li>FLAG_CLOSE: no option data</li>
 <li>FLAG_RESET: no option data</li>
-<li>FLAG_SIGNATURE_INCLUDED: net.i2p.data.Signature</li>
+<li>FLAG_SIGNATURE_INCLUDED: net.i2p.data.Signature (40 bytes)</li>
 <li>FLAG_SIGNATURE_REQUESTED: no option data</li>
-<li>FLAG_FROM_INCLUDED net.i2p.data.Destination</li>
-<li>FLAG_DELAY_REQUESTED: 1 byte integer</li>
+<li>FLAG_FROM_INCLUDED net.i2p.data.Destination (typ. 387 bytes)</li>
+<li>FLAG_DELAY_REQUESTED: 2 byte integer</li>
 <li>FLAG_MAX_PACKET_SIZE_INCLUDED: 2 byte integer</li>
 <li>FLAG_PROFILE_INTERACTIVE: no option data</li>
 </ol>
@@ -179,5 +199,12 @@ for the signature being set to all zeroes.</p>
 <p>If the sequenceNum is 0 and the SYN is not set, this is a plain ACK 
 packet that should not be ACKed</p>
 
+<h2>Future Work</h2>
+<p>
+There are proposals to replace the streaming lib with standard TCP
+(or perhaps a null layer together with raw sockets).
+This would unfortunately be incompatible with the streaming lib
+but it would be good to compare the performance of the two.
+</p>
 
 {% endblock %}