propagate from branch 'i2p.www' (head 114708fc5836389206fe26e04905a1887f34a228)

to branch 'i2p.www.revamp' (head 061377e9345d8848b120576d4174d4274a2e5ca3)

i2p2www/pages/downloads/debian.html

@@ -8,14 +8,10 @@ The packages hosted on <a href="https://launchpad.net/%7Ei2p-maintainers/+archiv
 have been tested and <em>should </em>work on x86/x86_64 platforms running:
 {%- endtrans %}
 <ul>
-  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Hardy <em>8.04</em> and newer){% endtrans %}</li>
-  <li><a href="#ubuntu">Mint</a> <em>11</em></li>
-  <li>{% trans %}<a href="#debian">Debian Linux</a> (Lenny and newer) &amp; <a href="#nonlinux">kFreeBSD</a> (Wheezy){% endtrans %}</li>
+  <li>{% trans %}<a href="#ubuntu">Ubuntu</a> (Precise <em>12.04</em> and newer){% endtrans %}</li>
+  <li><a href="#ubuntu">Mint</a></li>
+  <li>{% trans %}<a href="#debian">Debian Linux</a> (Wheezy and newer) &amp; <a href="#nonlinux">kFreeBSD</a>{% endtrans %}</li>
   <li><a href="#debian">Knoppix</a></li>
-  <li><a href="#debian">Simply MEPIS</a> <em>8.5.03-rel1</em></li>
-  <li><a href="#ubuntu">Trisque</a>l <em>4.5.1</em></li>
-  <li><a href="#debian">gNewSense</a> <em>2.3</em></li>
-  <li><a href="#nonlinux">Nexenta</a> <em>3.0.1</em></li>
 </ul>
 
 {% trans trac=i2pconv('trac.i2p2.i2p') -%}
@@ -25,11 +21,11 @@ with these packages on <a href="http://{{ trac }}">Trac</a> at
 {%- endtrans %}
 <ul>
   <li>{% trans %}Option 1: <a href="#ubuntu">Recent versions</a> of Ubuntu and its derivatives (<em>Try this if you're not using Debian)</em>{% endtrans %}</li>
-  <li>{% trans %}Option 2: <a href="#debian">Debian</a> (including systems based on Debian and older versions of Ubuntu){% endtrans %}</li>
+  <li>{% trans %}Option 2: <a href="#debian">Debian</a> (including Debian-derivatives){% endtrans %}</li>
   <li>{% trans %}Option 3: <a href="#nonlinux">Non-Linux</a> (and possibly Non-x86 architectures){% endtrans %}</li>
 </ul>
 
-<h2 id="ubuntu">{{ _('Instructions for Ubuntu Lucid Lynx (and newer) and derivatives like Linux Mint &amp; Trisquel') }}</h2>
+<h2 id="ubuntu">{{ _('Instructions for Ubuntu Precise Pangolin (and newer) and derivatives like Linux Mint &amp; Trisquel') }}</h2>
 <h5>{{ _('Adding the PPA via the command line and installing I2P') }}</h5>
 <ol>
   <li>
@@ -76,7 +72,7 @@ was added with the earlier command.
     In the Quick Filter box, type in <code>i2p</code> and press enter. When <code>i2p</code> is returned in the results list, right click <code>i2p</code> and select <em>Mark for Installation</em>. After doing so you may see a <em>Mark additional required changes?</em> popup. If so, click <em>Mark</em> then <em>Apply</em>.
     {%- endtrans %}
   </li>
-</ol> 
+</ol>
 
 {% trans -%}
 After the installation process completes you can move on to the next
@@ -85,6 +81,8 @@ part of <a href="#Post-install_work">starting I2P</a> and configuring it for you
 
 <h2 id="debian">{{ _('Instructions for Debian Lenny and newer') }}</h2>
 
+<p>(<em>{% trans %}For Squeeze you can follow the instructions <a href="#nonlinux">here</a>.{% endtrans %}</em>)</p>
+
 {% trans -%}
 The steps below should be performed with root access (i.e., switching
 user to root with "su" or by prefixing each command with "sudo").
@@ -97,13 +95,9 @@ user to root with "su" or by prefixing each command with "sudo").
 &nbsp;&nbsp;&nbsp;&nbsp;<img src="{{ url_for('static', filename='images/add-key-terminal.png') }}" alt="" />
   </li>
   <li>
-    {% trans %}For Debian Oldstable (Lenny) and Stable (Squeeze): Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code>{% endtrans %}<br />
-    <code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main <br />
-&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main </code><br />
-<br />
-{% trans %}For Debian Testing (Wheezy) or Unstable (Sid), use the following:{% endtrans %}<br />
-    <code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main <br />
-&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main </code><br />
+    {% trans %}Add the following entries to <code>/etc/apt/sources.list.d/i2p.list</code>{% endtrans %}<br />
+    <code>&nbsp;&nbsp;&nbsp; deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main <br />
+&nbsp;&nbsp;&nbsp; deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main </code><br />
   </li>
   <li>
     {% trans %}Notify your package manager of the new PPA by entering{% endtrans %}<br />
@@ -131,8 +125,10 @@ user to root with "<code>su</code>" or by prefixing each command with "<code>sud
 {%- endtrans %}<br />
 <ol>
   <li>
-    {% trans -%}
-    Download the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">i2p-router</a> package from the <a href="http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/">PPA</a>.
+    {% trans ppa='http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/',
+kytv='http://'+i2pconv('killyourtv.i2p')+'/debian/' -%}
+Download the <a href="{{ ppa }}">i2p-router</a> package from the <a href="{{ ppa }}">PPA</a>.
+Alternatively, there are unofficial packages available <a href="{{ kytv }}">here</a> for <code>armel, armhf, and kfreebsd</code>.
     {%- endtrans %}
   </li>
   <li>

i2p2www/pages/downloads/list.html

@@ -23,12 +23,12 @@ or type <tt>java -version</tt> at your command prompt.
 <div class="package">
   <h1>Windows</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_redirect', protocol='https', file=ver('i2pinstall_%s_windows.exe'), mirror=1) }}">i2pinstall_{{ ver() }}_windows.exe</a> (Google Code)
-    (<a href="{{ get_url('downloads_select', file=ver('i2pinstall_%s_windows.exe')) }}">{{ _('select alternate link') }}</a>)
+    <a href="{{ url_for('downloads_redirect', protocol='https', file='i2pinstall_0.9.5-win1_windows.exe', mirror=1) }}">i2pinstall_0.9.5-win1_windows.exe</a> (Google Code)
+    (<a href="{{ get_url('downloads_select', file='i2pinstall_0.9.5-win1_windows.exe') }}">{{ _('select alternate link') }}</a>)
     <div class="sig">
       (SHA256
-<code>d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e</code>
-      <a href="{{ url_for('downloads_redirect', protocol='https', file=ver('i2pinstall_%s_windows.exe.sig'), mirror=1) }}">sig</a>)
+<code>d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8</code>
+      <a href="{{ url_for('downloads_redirect', protocol='https', file='i2pinstall_0.9.5-win1_windows.exe.sig', mirror=1) }}">sig</a>)
     </div>
   </div>
   <div class="details">

i2p2www/pages/include/monotonerc.html

@@ -69,6 +69,7 @@ function get_revision_cert_trust(signers, id, name, val)
 		"01265f0c817b24548478341fb75e672720a78b21",	--  str4d@mail.i2p
 		"38fe2aa37e1eb9a300a2061ef153265c48031c6b",	--  walking@mail.i2p
 		"a0eb78d437efad120dd9edcd776a327ec2c2adde",	--  zab@mail.i2p
+		"2158706490e62a17c8140b6e9eabca965b681bc7",	--  zab2@mail.i2p
 		"896e399990704373125f782ae2ee19b6611ac612"	--  zzz@mail.i2p
    }
    local t = keyintersection(signers, trusted_signers)

i2p2www/pages/site/about/hall-of-fame.html

@@ -1,13 +1,13 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Hall Of Fame') }}{% endblock %}
 {% block content %}
-<!-- file version 2013.03.01.01 -->
+<!-- file version 2013.05.01.01 -->
 <h1>{% trans %}I2P'<small>s</small> Hall of Fame{% endtrans %}</h1>
-<b>{% trans date='2013-03-01' -%}
+<b>{% trans date='2013-05-01' -%}
 Current balance: as of {{ date }}
 {%- endtrans %}</b><br />
 <b>{{ _('General fund') }}:
-{% trans euroval='5940,28', btcval='1222,87398130' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
+{% trans euroval='28078,57', btcval='626,04640057' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
 <b><a href="{{ site_url('get-involved/bounties/datastore') }}">{{ _('Datastorage bounty') }}</a>:
 {% trans euroval='145.0', btcval='2' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
 <b><a href="{{ site_url('get-involved/bounties/ipv6') }}">{{ _('Native IPv6 I2P') }}</a>:
@@ -17,11 +17,12 @@ Current balance: as of {{ date }}
 <b><a href="{{ site_url('get-involved/bounties/deb-pack') }}">{{ _('I2P in debian mirrors') }}</a>:
 {% trans euroval='123.0' %}{{ euroval }} &euro;{% endtrans %}</b><br />
 <b><a href="{{ site_url('get-involved/bounties/btc-client') }}">{{ _('Bitcoin client for I2P') }}</a>:
-{% trans euroval='30.0', btcval='118.34' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
+{% trans btcval='50.34' %}{{ btcval }} BTC{% endtrans %}</b><br />
 <b><a href="{{ site_url('get-involved/bounties/unit-tests') }}">{{ _('Unit Tests for I2P router') }}</a>:
 {% trans euroval='2305' %}{{ euroval }} &euro;{% endtrans %}</b><br />
-<b>{{ _('Bounty Robert') }}: 0</b><br />
-<b>{{ _('Bounty Syndie') }}: 50 BTC</b><br />
+<b>{{ _('Bounty Robert') }}: 20</b><br />
+<b>{{ _('Bounty Syndie') }}: 18 BTC</b><br />
+<b>{{ _('Bounty I2P for CCR Microtic Board') }}: 10 &euro;</b><br />
 
 <br />
 <b>{{ _('Current monthly running costs:') }}</b><br />
@@ -86,7 +87,46 @@ with your name or nick (and optionally homepage) so we can list you here.
  <tr><td>Feb, 2013</td><td>anonymous</td><td>0.01234567 BTC</td><td></td><td>General fund</td></tr> 
  <tr><td>Feb, 2013</td><td>Change Syndie/IPv6 bounty</td><td>50 BTC</td><td>50 BTC</td><td>Bounty Syndie,IPv6</td></tr>
  
+ <tr><td>Mar, 2013</td><td>Sell BTC</td><td>2598 &euro;</td><td>100 BTC</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>I2P Laptop</td><td></td><td>846,05 &euro;</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>Sell BTC</td><td>4123 &euro;</td><td>100 BTC</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>David Julian</td><td>30 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>I2P Laptop</td><td></td><td>117,46 &euro;</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>anonymous</td><td>20 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>anonymous</td><td>30 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>Sell BTC</td><td>4998 &euro;</td><td>100 BTC</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>Sell BTC</td><td>5923 &euro;</td><td>100 BTC</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>i2p-projekt.net domain</td><td></td><td>11,90 &euro;</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>Sell BTC</td><td>7889 &euro;</td><td>100 BTC</td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>anonymous</td><td>25 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>anonymous</td><td>0.01234567 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>echelon</td><td>10 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2013</td><td>Recalc Syndie Bountie</td><td>32 BTC</td><td>32 BTC</td><td>General fund, Syndie bounty</td></tr>
+
+ <tr><td>Apr, 2013</td><td>SSL cert syndie.de</td><td></td><td>389,70 &euro;</td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>SSL cert geti2p.net</td><td></td><td>389,70 &euro;</td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>5 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>giv</td><td>30 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>20 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>30 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>Flattr</td><td>107,80 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>SSL cert i2p2.de</td><td></td><td>2009,70 &euro;</td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>4 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>1 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>29C3 contest</td><td></td><td>25 BTC</td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>29C3 contest</td><td></td><td>5 BTC</td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>29C3 contest</td><td></td><td>10,3 BTC</td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>0.15 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>0.000024 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>0.0000496 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>anonymous</td><td>0.01 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2013</td><td>Bounty native I2P BTC client paid to giv</td><td></td><td>30 &euro;</td><td>Bounty BTC client</td></tr>
+ <tr><td>Apr, 2013</td><td>Bounty native I2P BTC client paid to giv</td><td></td><td>68 BTC</td><td>Bounty BTC client</td></tr>
  
+ <tr><td>May, 2013</td><td>anonymous</td><td>50 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2013</td><td>anonymous</td><td>0.3 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2013</td><td>anonymous</td><td>10 &euro;</td><td></td><td>Bounty CCR Microtic Board</td></tr>
  
 </table> 
 <br />

i2p2www/pages/site/docs/spec/common-structures.html

@@ -612,7 +612,10 @@ Cost is typically 5 or 6 for SSU, and 10 or 11 for NTCP.
 {%- endtrans %}</li>
 
 <li>{% trans -%}
-Expiration is currently unused, always null (all zeroes))
+Expiration is currently unused, always null (all zeroes)).
+As of release 0.9.3, the expiration is assumed zero and not stored, so any non-zero expiration
+will fail in the RouterInfo signature verification.
+Implementing expiration (or another use for these bytes) will be a backwards-incompatible change.
 {%- endtrans %}</li>
 </ul>
 

i2p2www/pages/site/docs/spec/i2cp.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}I2CP Specification{% endblock %}
-{% block lastupdated %}December 2012{% endblock %}
-{% block accuratefor %}0.9.4{% endblock %}
+{% block lastupdated %}April 2013{% endblock %}
+{% block accuratefor %}0.9.5{% endblock %}
 {% block content %}
 <h1>I2P Control Protocol (I2CP) Specification</h1>
 <h2>Overview</h2>
@@ -179,6 +179,7 @@ Actual message length limit is about 64 KB.
 <p>
 Uniquely identifies a message waiting on a particular router at a
 point in time.
+This is always generated by the router and is NOT the same as the nonce generated by the client.
 </p>
 <h4>Contents</h4>
 <ol><li>
@@ -652,13 +653,13 @@ For an outgoing message, this is a response to a
 <ol><li>
 <a href="#struct_SessionId">Session ID</a>
 </li><li>
-<a href="#struct_MessageId">Message ID</a>
+<a href="#struct_MessageId">Message ID</a> generated by the router
 </li><li>
 1 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> status
 </li><li>
 4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> size
 </li><li>
-4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> nonce
+4 byte <a href="{{ site_url('docs/spec/common-structures') }}#type_Integer">Integer</a> nonce previously generated by the client
 </li></ol>
 
 <h4>Notes</h4>

i2p2www/pages/site/docs/spec/i2np.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}I2NP Specification{% endblock %}
-{% block lastupdated %}September 2012{% endblock %}
-{% block accuratefor %}0.9.2{% endblock %}
+{% block lastupdated %}April 2013{% endblock %}
+{% block accuratefor %}0.9.5{% endblock %}
 {% block content %}
 <h1>I2P Network Protocol (I2NP) Specification</h1>
 <p>
@@ -570,9 +570,13 @@ from:
 
 flag:
      1 byte
-     valid values:
+     bit order: 76543210
+     bit 0:
              0  FALSE => send reply directly
              1  TRUE  => send reply to some tunnel
+     bits 7-1:
+             Through release 0.9.5, must be set to 0
+             As of release 0.9.6, ignored, set to 0 for compatibility with future uses and with older routers
 
 reply tunnelId:
                4 byte Tunnel ID

i2p2www/pages/site/docs/transport/index.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Transport Overview{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}July 2010{% endtrans %}{% endblock %}
-{% block accuratefor %}0.8{% endblock %}
+{% block lastupdated %}{% trans %}April 2013{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.5{% endblock %}
 {% block content %}
 <h1>{% trans %}Transports in I2P{% endtrans %}</h1>
 
@@ -87,9 +87,18 @@ directly-accessible IP and ports.
 
 <h2>{% trans %}Transport Selection{% endtrans %}</h2>
 
-<p>{% trans i2np=site_url('docs/protocol/i2np') -%}
+<p>{% trans i2np=site_url('docs/protocol/i2np'),
+streaming=site_url('docs/api/streaming'),
+datagrams=site_url('docs/api/datagrams') -%}
 The transport system delivers <a href="{{ i2np }}">I2NP messages</a>. The transport selected for any message is
-independent of the application-layer protocol (TCP or UDP).
+independent of the upper-layer protocols and contents (router or client messages, whether an external application was using
+TCP or UDP to connect to I2P, whether the upper layer was using
+<a href="{{ streaming }}">the streaming library</a>
+streaming
+or
+<a href="{{ datagrams }}">datagrams</a>,
+datagrams
+etc.).
 {%- endtrans %}</p>
 
 <p>{% trans -%}
@@ -130,9 +139,10 @@ Additional transports may be developed, including:
 <li>{% trans %}An "indirect" transport for routers that are not reachable by all other routers (one form of "restricted routes"){% endtrans %}</li>
 </ul>
 
-<p>{% trans -%}
-Also, the existing transports will be enhanced to support multiple addresses within a single transport,
+<p>{% trans thread='http://'+i2pconv('zzz.i2p')+'/topics/109' -%}
+IPv6: The existing transports must be enhanced to support multiple addresses within a single transport,
 including IPV6 addresses. Currently, a transport may only advertise a single IPV4 address.
+See <a href="{{ thread }}">this thread</a> for discussion.
 {%- endtrans %}</p>
 
 <p>{% trans -%}

i2p2www/pages/site/get-involved/bounties/index.html

@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Bounties') }}{% endblock %}
 {% block content %}
-<!-- file version 2013.02.24.01 -->
+<!-- file version 2013.03.31.01 -->
 <h1>{{ _('Bounties for I2P') }}</h1>
 <p>{% trans -%}
 While we always gratefully accept any contributions of code, 
@@ -82,7 +82,7 @@ etc), and the like.
   <td><p>{{ _('Proposal in development') }}</p></td>
   <td><p>I2P team</p></td>
   <td><p>[{{ _('vacant') }}]</p></td>
-  <td><p>50 BTC</p></td>
+  <td><p>18 BTC</p></td>
  </tr>
  </table>
 

i2p2www/pages/site/get-involved/bounties/syndie-2012.html

@@ -3,7 +3,7 @@
 {% block donatename %}{{ _('Syndie development') }}{% endblock %}
 
 {% block bountydetails %}
-<!-- file version 2013.02.24.01 -->
+<!-- file version 2013.03.31.01 -->
 <p>{% trans -%}
 Beside of I2P we want to encourage users
 to care more about anonymity and security. As I2P is a low 
@@ -12,7 +12,7 @@ can overcome some of these limits and provide better anonymity
 for people who really need it.
 {%- endtrans %}</p>
 <p>{% trans -%}
-For our bad sake the syndie project is out of development for 
+For our bad sake the syndie project was out of development for 
 quite a long time yet (5 years). To get a fresh and new built 
 with needed bugfixes we set out this bounty. Also syndie needs
 some enhancements and a better GUI for users to work with it.
@@ -26,6 +26,26 @@ was created and made available on different webpages.
 As a result of this work, the bounty sum was reduced and
 the withdrawn money moved to the IPv6 bounty.
 {%- endtrans %}</p>
+<p>
+Still a few jobs are left to be done, e.g. (taken from Lillith syndie post
+ urn:syndie:channel:d7:channel44:FRkKGjUxBPXAIG~j6uc4S7cEeQ6Eb0y44wEeuWxREYU=9:messageIdi1364502130641ee ):<br>
+1. Port Syndie to AWT or another platform agnostic toolkit <br>
+2. Fix most, if not all GUI bugs (this relates to the first point somewhat) <br>
+3. Port Syndie to HSQLDB 2.0 <br>
+4. Be the maintainer for Syndie over a period of time (an amount per month or per quarter) and do the usual 
+tasks like accepting and fixing minor bugs, promote Syndie in the wider world than just I2P, maintaining
+ good documentation <br>
+5. Add some sort of 'File Archive' as a transport (for sneakernets) <br>
+6. Add more transports from the introduction image to Syndie: Usenet, Gnutella, E-Mail, iMule, Tahoe-LAFS <br>
+7. Get syndie into repos for major distros (at least, Debian, Fedora, Arch, Gentoo, FreeBSD ports, PkgSrc) <br> 
+8. Make the freenet archive work <br>
+</p>
+<p>
+As these subtasks are of different difficulty and work, different amount of bounty are assigned to it:<br>
+1. 5 BTC, 2. 2 BTC, 3. 2 BTC, 4. pure passion and appreciation by all the users, 5. 1 BTC, 6. 5 BTC, 7. 2 BTC and
+finally 8. 1 BTC.<br>
+Sum: 18 BTC<br> 
+</p>
 {% endblock %}
 
 {% block bountynotesouter %}{% endblock %}

i2p2www/pages/site/get-involved/develop/developers-keys.html

@@ -228,6 +228,14 @@ lZGWQsF5G3ppvJ1Kwt/dUGi7gHbclKPnFAWXmb7YWOhl9Ua2USjQ4Y
 rIeB7/2uVOpe+3FrFgUzIiWsx6I2yiNI3TscDvQsa5wG0Z2G4BbHXj
 ONyiUzzO+j2TWPs3x35r2LCy8plRzPAswCF1GaIEjJCce5zwIDAQAB
 [end]
+
+[pubkey zab2@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLabJXvbBfHZ4zH2
+kom+W2Kb3kYYs58j8ZygkK9rj8j2SrlokxLiLABVYK7tdlb1zgZJVY
+gO8flnqsOSGb2CtoQ3i3Fqk0HNq2if47LVyaLwgOyoPOhYkDDGr9Wg
+gBp+svAHALMoGvh0lemKQZpQfdMgZ33k2l2o3Udvj3tpB/KwIDAQAB
+[end]
+
 </pre>
 <h3 id="transport">{{ _('Developer Transport Keys') }}</h3>
 <p>{% trans monotone=site_url('get-involved/guides/monotone') -%}
@@ -389,6 +397,14 @@ I2CzDAkmI1ZJgEwZxGm3Dn/Jj7aNjXsJQeWDe4VSwVvtJdzwbrp3qm
 GBapx3KtetESkPtq6BVL2j5qXP3rQ2QP4nOFh05DcuiO7D+uqHpLIb
 tPXStQO9WfFgCzXRMvpCkX4OdnoRGgFkiIZHQJxT+ATLtNwQIDAQAB
 [end]
+
+[pubkey zab2-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmh9ukHhxTY3/bDs
+At7mOUETxO3sLrf70kR9Mn4p44c4NKuFF4APmeYaFfIP9N5ZkBxY+5
+2YPCQNXdtLDAPpxrq9as+IOaxH3ZVENllml0iCuGjZWtvYVkxHXCKo
+hMMlffgZFJeDIEEed3eIttUPsIdW8U+2XQM1zF9R77+K0ZJQIDAQAB
+[end]
+
 </pre>
 
 {% endblock %}

i2p2www/pages/site/get-involved/develop/license-agreements.html

@@ -736,5 +736,38 @@ G58Br6HXTQLV8xAN1ml8
 =4989
 -----END PGP SIGNATURE-----
 
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+I lost my original keys, will be using these going forward.
+
+Thanks,
+zab
+
+[pubkey zab2@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLabJXvbBfHZ4zH2kom+W2Kb3kYYs58j8ZygkK9rj8j2SrlokxLiLABVYK7tdlb1zgZJVYgO8flnqsOSGb2CtoQ3i3Fqk0HNq2if47LVyaLwgOyoPOhYkDDGr9WggBp+svAHALMoGvh0lemKQZpQfdMgZ33k2l2o3Udvj3tpB/KwIDAQAB
+[end]
+[pubkey zab2-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmh9ukHhxTY3/bDsAt7mOUETxO3sLrf70kR9Mn4p44c4NKuFF4APmeYaFfIP9N5ZkBxY+52YPCQNXdtLDAPpxrq9as+IOaxH3ZVENllml0iCuGjZWtvYVkxHXCKohMMlffgZFJeDIEEed3eIttUPsIdW8U+2XQM1zF9R77+K0ZJQIDAQAB
+[end]
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAEBAgAGBQJRdvPLAAoJEJkeLHPsdqhZvAgP/02btw3WcVZ1CSJkfSrZ/shE
+ooBPao/nq0XYY9GZdGbA2Ki/5HOKnPTyulPwCNocL3EULFzR9bCAr2ZdjujOdKOO
+6RQc6QcebGvtQF21eLdffT+LiHVI6Vl1y2ls288WP4YYhBXmaf7vj+6wNHf2l/B7
+wiFEZH2nfyml7fruyWa0GHmWla96rbdMfXMdJAIcu/Uv0E5AeUHhHYhrDAZFf1/0
+CzdW/MvXCtan0WwrNHfFmeDx29kT9wtF3cgduyBj/K4Kw1NDGpXt3w5Hybp0xak5
+mpCo+lAxpC6DgjaTvrF54Hnqe21dydUdfwTZ7dtzfPbEwK5LrAWJCpjnlYO3kote
+GUYXyGccg4A6nknCrkeidJcaF1j4xpJf38XY08z48r+Wd0/n5VSDbvo6BBcOljgp
+IC1YQMcnFdRcV/K7MNlm58+WTa6NqJgrqnMnHDwdwF2v4csH4hjVmOD5//u6pCNg
+ghCMrTVuEP6fqFJflFdKYfG/jlX7Vm1hh0a4QobWsII2A8TBGe9x3//ZXhX3d57c
+mFhMwzjnCWdUTAfGPKeT+YorOnL9YRwsoXyBm4LjKGuHAMOKYpbS+6aZV2plPgIe
+QUamNO18hBy7N/YdF2DPoV41ntobkM+kVfmR0jLCbiNjisMg1eO8mQ1ynY4Kf2F1
+6+WauW2gCAnDCnD/+EEh
+=7u31
+-----END PGP SIGNATURE-----
+
 </pre>
 {% endblock %}

i2p2www/static/hosts.txt

@@ -343,4 +343,4 @@ push.git.repo.i2p=Mau9Jcsspec4cbDlrkt5zdxN-kq9SG9GxtvOQ6wBhgJKxRyEvZG4oqGs5N6oO6
 irc.killyourtv.i2p=CnG0yQheyd67rl1nHuYZp1sVZxzXHe05UPrmT0B3Vxtd51K-Cq5E6v5~UTrU5lqj56ggvnRl0I8jg1vPn0Q50IH6ght~4ThkKlwDwTOMHmROz3sR6WLCOvD4ZFMDBYjBsxjF3383YSIlYrh~laTXSzD~lPhHLGD1jFQksqea-87sM-yfRzCbA7UyaHtURJ7A3GOb8Bm8W25mPOHpM~xT0TONvbi45IVmAeWkuZ5IhBsrzhWvY1-Riy6IW6KSRoQIZtr5o23cVHkjUh8J-~SWZR5wIgECefrVVCt556qDn35I2829Jlk26-iI9glMrr7funaOtp1wnDvNPTijlxwkeAx9GKPCX48nCyxIUeSTwGv0grDPn43V94tV0LSq8mkXZ1akDJUNf33z2Uao-nCi-ufb0Mt0rzgdRVW1i79GQHk4XbApzjYUjyaSY4cuR0yBRFHrOcrFt~XJABpt9DYklu6y3n54uOLZeXGnE5nKCSHLqyS3dxPTObIQvhz~ZjHRAAAA
 www.syndie.i2p=DvyDrcY8se2M~qqp4qfZn-6UTFfS2Ieaye5QIhKoFQGktMbCK2MzhAMYvNm7n1k9O0hG86-nXPCP8rlFurPrCAKta~baUlCgbV4ft5zzu0Y4DFuhC6p-3V-03S5WF8JA5Pt4KEcKKEYiOkHzGVSKuWIjH11syZ434c0qarOFfynS1ZI2Ixlv2OXCEzs-r5NeMRy3tfwbLyPF46END1CyoWCNx-FUdOt5ueXVokYeJ00Pzqvhqb6ByqRh76N3Fz3GGIUjjSmSljDSN8B0K9943jKXCoH75YnC47cw~RwSD53pbLXiLWHqtIiqx8Zvq5LgIac9UVpIA9Ka27TWa5OhVhBKwuynPnfVaLv2xOR8dEDmVNnO8sNp4kP~MMTvJAUJfhAbPFbAs9i4Wx0IlLKN5gLnft-7Xd1pMivKZZaNWFicwr69VMub-ddl~vbhtueIvmkEdoLIw4xBb6nHmKy0gHi6TWjEmLXb8SsgDOkri7Nu9qRV8t6VF60wpjHPG33eAAAA
 syndie-project.i2p=2~qacMy9FwwWCFm3JYRKSLIe8u6wEuinZPre0WoZC-M3IUSg8VhUp1QSPuaeFJdym69hjew6AOE-wnZ30mtzriXyvaYh7UNshTc9ZdEBWwhdn5cghMjf48HdBw3pKAiiw1gwv8WwsskbAxbSTkcQUmqGsterPyUqspSqddwUkcDxZHC7dUJsyyd4gcul40KljlIu9mMWXZLWQ7Zu8od~NcFNHVBE-UnTvDmHErpx7AWcN9VrD4j-OuVqsLYq1T9uhdLH-~H~9eE5RKekz6ehhGJRLlGB~2~MYVt4xrqbo4z18nFxdp9PorOO1wt5xiFSw4GEX5HAO2~pt97DVkcwogOEVCJbRbLiIJJDmehn5PB-56K4tjuUNFtzLAq7QQZEAAHGCUEaVPUObKS20vU~JN6GrAOAXKM2M-16frR0ddpJ4f55iuc~tVL3OFPAtha5aHP9xihP7i80rB5LsG0aT77Ey~mCWHrV2sQwhua40vP9TgpCi6Lg21DnVrR97S5tAAAA
-
+lists.i2p2.i2p=iKMDu6cP~nt4vubwZOuXWDQS4zdhF9x2YjhcilOrRIHR7lkP6ErNgUHZb~ggwnRaPkj81JpmbwDJ1GR~LLS7DcN5ktSZ1WhjVfrm92AQ4-yDX5HEcPpCnTPBp11zsrh2WEDXSjWMqyBPbkYMzrJ33ZGxVMxccXLlV~W9ecPrpl7EmrIF1gPmbinG1oDA0wFLaJyXPZrCRhdX6xMDgvb0slHE0pxAM00TeAQK~aL~LZ5iwfA7WllYd9jaDdQ-kjaa6qEKSSQHf~bNycR~OFsxKurh1CIbrglo8vIHss-tjIfKzG2mgO8w8AE01uhlsRTxjq7TYhxTWKn4kTFyaljJCE-SL1XTYwfyEEZ90bH8Puk1zDnKIARXMPA1YM26StySLLoFyQu2SbNfJcgCqYFcGStvaG54QFCLVnHOxTKi-Z3D-PBMc9aRKSHJilN1kzExGKNZSW09wX7btyEUCHXJjbep6oFauwrtGmP9SjjZf-o3BHzvQlaLSzVFKuPJ-5tQAAAA