propagate from branch 'i2p.www.revamp' (head 2086f98299a757a276edb28a2702abb4d9734bcb)

to branch 'i2p.www' (head c93fe7218ef5779c482bb3fbb2d4d699b2646f86)

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

@@ -1,12 +1,12 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Hall Of Fame') }}{% endblock %}
 {% block content %}
-<!-- file version 2014.12.23.01 -->
+<!-- file version 2015.12.01.01 -->
-<b>{% trans date='2014-12-23' -%}
+<b>{% trans date='2015-12-01' -%}
 Current balance: as of {{ date }}
 {%- endtrans %}</b><br />
 <b>{{ _('General fund') }}:
-{% trans euroval='44644,32', btcval='537,72784571' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
+{% trans euroval='38838,28', btcval='516,95196524' %}{{ 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/i2phex') }}">{{ _('I2PHex bounty') }}</a>:
@@ -22,15 +22,15 @@ Current balance: as of {{ date }}
 <b>{{ _('Bounty I2P for CCR Microtic Board') }}: 10 &euro;</b><br />
 
 <br />
-<b>{{ _('Current monthly running costs:') }}</b><br />
+<b>{{ _('Current running costs:') }}</b><br />
 <table border="1">
     <tr>
-        <td>Welterde</td>
+        <td>EUServ root server</td>
-        <td>8 &euro;/mo, since January, 2008 - i2p2.de</td>
+        <td>660 &euro;/year, since January, 2015</td>
     </tr>
     <tr>
         <td>eche|on</td>
-        <td>40 &euro;/mo since January, 2008 - i2p-projekt.de and domains</td>
+        <td>71,40 &euro;/year since January, 2013 - i2p-projekt.de and domains</td>
     </tr>
 </table>
 <p>{% trans %}Big thanks go to the following people who have donated to I2P!{% endtrans %}</p>
@@ -41,10 +41,146 @@ with your name or nick (and optionally homepage) so we can list you here.
 
 <b>{{ _('Current monthly subscriptions:') }}</b><br />
 <table border="1">
-  <tr><td>07/2014-07/2015</td><td>JULLIAN David</td><td>10 &euro;</td><td>{{ _('General fund') }}</td></tr>
+  <tr><td>09/2015-08/2016</td><td>Alex</td><td>20 &euro;</td><td>{{ _('General fund') }}</td></tr>
 </table>
 <br />
 
+<b>{{ _('2015 donations and costs:') }}</b><br />
+<table border="1">
+ <tr><td>date</td><td>who</td><td>income</td><td>outgoing</td><td>account</td></tr>
+ <tr><td>Jan, 2015</td><td>donation</td><td></td><td>569 &euro;</td><td>Sponge</td></tr>
+ <tr><td>Jan, 2015</td><td>anonymous</td><td>90 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Jan, 2015</td><td>Support Meeh</td><td></td><td>500 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2015</td><td>Support echelon</td><td></td><td>300 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2015</td><td>EUServ Rootserver</td><td></td><td>660 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2015</td><td>zzz Win 8.1 laptop</td><td></td><td>210,13 &euro;</td><td>general fund</td></tr> 
+ 
+ <tr><td>Jan, 2015</td><td>anonymous</td><td>0.04 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jan, 2015</td><td>KyTv services</td><td></td><td>2.8 BTC</td><td>General fund</td></tr>
+ <tr><td>Jan, 2015</td><td>dg services</td><td></td><td>0.4 BTC</td><td>General fund</td></tr>
+ 
+ <tr><td>Feb, 2015</td><td>donation JJE</td><td>50 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2015</td><td>Sending Stickers</td><td></td><td>21,80 &euro;</td><td>general fund</td></tr>
+ <tr><td>Feb, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2015</td><td>anonymous</td><td>0,89 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2015</td><td>donation anonotaku18</td><td>10,51 &euro;</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Feb, 2015</td><td>anonymous</td><td>0.05 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Mar, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2015</td><td>Domain i2pproject.net</td><td></td><td>11,9 &euro;</td><td>general fund</td></tr>
+ <tr><td>Mar, 2015</td><td>Domain i2pproject,syndie</td><td></td><td>59,5 &euro;</td><td>general fund</td></tr>
+ <tr><td>Mar, 2015</td><td>anonymous</td><td>70 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2015</td><td>Support Postman</td><td></td><td>500 &euro;</td><td>general fund</td></tr>
+ <tr><td>Mar, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Mar, 2015</td><td>anonymous</td><td>0.01 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Apr, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>anonymous</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>Sending Stickers</td><td></td><td>9,90 &euro;</td><td>general fund</td></tr>
+ <tr><td>Apr, 2015</td><td>anonymous</td><td>5 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>Hottuna Rasperry Pi 2</td><td></td><td>56 &euro;</td><td>general fund</td></tr>
+
+ <tr><td>Apr, 2015</td><td>anonymous</td><td>0.1 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>anonymous</td><td>0.0773 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Apr, 2015</td><td>dg Rasperry Pi 2</td><td></td><td>0.25 BTC</td><td>General fund</td></tr>
+
+ <tr><td>May, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2015</td><td>Leonardo</td><td>14 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2015</td><td>anonymous</td><td>15 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2015</td><td>anonymous</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>May, 2015</td><td>pcboy</td><td>15 &euro;</td><td></td><td>General fund</td></tr>
+ 
+ <tr><td>May, 2015</td><td>anonymous</td><td>0.00325375 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Jun, 2015</td><td>Sending Stickers</td><td></td><td>21,80 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jun, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Jun, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr> 
+ <tr><td>Jun, 2015</td><td>Stian Berger</td><td>60 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Jun, 2015</td><td>Sending Stickers</td><td></td><td>21,80 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jun, 2015</td><td>TShirts I2P Con Toronto 2015</td><td></td><td>162 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jun, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Jun, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Jun, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Jun, 2015</td><td>travel support I2Pcon</td><td></td><td>6 BTC</td><td>General fund</td></tr>
+ <tr><td>Jun, 2015</td><td>travel support I2Pcon</td><td></td><td>1 BTC</td><td>General fund</td></tr> 
+ <tr><td>Jun, 2015</td><td>anonymous</td><td>0.0488 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Jul, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>  
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.00485993 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>travel support I2Pcon</td><td></td><td>1.5 BTC</td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.00581971 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.04 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.00839704 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.01884516 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.01714 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.005 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Jul, 2015</td><td>anonymous</td><td>0.01701606 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Aug, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>anonymous</td><td>15 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>stickers</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>anonymous</td><td>15 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>stickers</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>anonymous</td><td>20 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>stickers</td><td>19 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>MasterCard Red buying costs</td><td></td><td>33 &euro;</td><td>general fund</td></tr>
+ <tr><td>Aug, 2015</td><td>MC Red filling cost</td><td></td><td>11,40 &euro;</td><td>general fund</td></tr>
+ <tr><td>Aug, 2015</td><td>Toronto I2Pcon spents: sweets,HackLab rent,misc</td><td></td><td>400 &euro;</td><td>general fund</td></tr>
+ <tr><td>Aug, 2015</td><td>Toronto spents from MC Red: dinner,drinks</td><td></td><td>553,62 &euro;</td><td>general fund</td></tr>
+ <tr><td>Aug, 2015</td><td>Toronto travel support</td><td></td><td>1200 &euro;</td><td>general fund</td></tr>
+ <tr><td>Aug, 2015</td><td>anonymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>Sending Stickers</td><td></td><td>9,90 &euro;</td><td>general fund</td></tr>
+
+ <tr><td>Aug, 2015</td><td>anonymous</td><td>0.11211 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Aug, 2015</td><td>anonymous</td><td>0.0059006 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Sep, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Sep, 2015</td><td>susbarbatus</td><td>35 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Sep, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Sep, 2015</td><td>anonymous</td><td>0.02387285 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Sep, 2015</td><td>anonymous</td><td>1 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Sep, 2015</td><td>anonymous</td><td>0.01 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Sep, 2015</td><td>anonymous</td><td>0.1 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Oct, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>ComeIn3s</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>anonymous</td><td>4,13 &euro;</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Oct, 2015</td><td>anonymous</td><td>0.01 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>anonymous</td><td>0.01266157 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>32C3 travel support</td><td></td><td>9.2434 BTC</td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>dg Android tablet</td><td></td><td>0.4366 BTC</td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>anonymous</td><td>0.03037511 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Oct, 2015</td><td>anonymous</td><td>0.495 BTC</td><td></td><td>General fund</td></tr>
+
+ <tr><td>Nov, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>MC Red filling costs</td><td></td><td>7,92 &euro;</td><td>general fund</td></tr>
+ <tr><td>Nov, 2015</td><td>32C3 tickets</td><td></td><td>270 &euro;</td><td>general fund</td></tr>
+ <tr><td>Nov, 2015</td><td>ComeIn3s</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>32C3 tickets</td><td></td><td>90 &euro;</td><td>general fund</td></tr>
+ 
+ <tr><td>Nov, 2015</td><td>RWC 2016 support</td><td></td><td>1.45 BTC</td><td>General fund</td></tr>
+
+ <tr><td>Dec, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+
+</table> 
+
+We do accept Monero as donations, too. Currently no income.
+<br />
+<br />
 <b>{{ _('2014 donations and costs:') }}</b><br />
 <table border="1">
  <tr><td>date</td><td>who</td><td>income</td><td>outgoing</td><td>account</td></tr>
@@ -151,7 +287,13 @@ with your name or nick (and optionally homepage) so we can list you here.
  <tr><td>Dec, 2014</td><td>donation Eol</td><td>20 &euro;</td><td></td><td>General fund</td></tr>
  <tr><td>Dec, 2014</td><td>donation ratsmack</td><td>20 &euro;</td><td></td><td>General fund</td></tr>
  <tr><td>Dec, 2014</td><td>donation</td><td>50 &euro;</td><td></td><td>General fund</td></tr>
- <tr><td>May, 2014</td><td>anonymous</td><td>5 BTC</td><td></td><td>Sponge</td></tr>
+ <tr><td>Dec, 2014</td><td>anonymous</td><td>5 BTC</td><td></td><td>Sponge</td></tr>
+ <tr><td>Dec, 2014</td><td>donation</td><td>2 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2014</td><td>donation JULLIAN David</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2014</td><td>I2P on 31C3 costs</td><td></td><td>1257 &euro;</td><td>General fund</td></tr>
+ <tr><td>Dec, 2014</td><td>PayPal fees 2014</td><td></td><td>121,9 &euro;</td><td>General fund</td></tr>
+ <tr><td>Dec, 2014</td><td>anonymous</td><td>0.01579829  BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2014</td><td>anonymous</td><td>0.04728000 BTC</td><td></td><td>General fund</td></tr>
  
 </table> 
 Also we did got some donations of LTC. Current state is 703.981 LTC. For more

i2p2www/pages/site/docs/api/samv3.html

@@ -53,7 +53,8 @@ Version 3.1 was introduced in I2P release 0.9.14.
 
 <h3>Version 3.2 Proposal</h3>
 <p>
-Version 3.2 is not yet implemented, and the changes listed below are preliminary.
+Version 3.2 is scheduled for inclusion in I2P release 0.9.24, and the changes listed below are preliminary.
+The following changes will be incorporated in the main part of this document soon.
 <ul>
 <li>SESSION CREATE now supports options FROM_PORT=nnnn and TO_PORT=nnnn to set default I2P ports
 <li>SESSION CREATE STYLE=RAW now supports option PROTOCOL=nnn to set default I2P protocol (18 otherwise)
@@ -73,21 +74,35 @@ Version 3.2 is not yet implemented, and the changes listed below are preliminary
     with the response:
     PONG [arbitrary text from the ping], to be used for control socket keepalive.
     Either side may close the session and socket if no response is received in a reasonable time, implementation dependent.
-<li>For authorization, client adds USER=xxx PASSWORD=yyy to the HELLO parameters.
+<li>For authorization, client adds USER="xxx" PASSWORD="yyy" to the HELLO parameters.
+    Double quotes for user and password are recommended but not required.
+    A double quote inside a user or password must be escaped with a backslash.
     On failure the server will reply with an I2P_ERROR and a message.
-<li>(optional feature) Authorization configuration with the AUTH command:
+<li>(optional feature) Authorization configuration with the AUTH command.
+    A SAM server may implement these commands to facilite persistent storage of credentials.
   <ul>
     <li>AUTH ENABLE enables authorization on subsequent connections
     <li>AUTH DISABLE disables authorization on subsequent connections
-    <li>AUTH ADD USER=foo PASSWORD=bar adds a user/password
+    <li>AUTH ADD USER="foo" PASSWORD="bar" adds a user/password
-    <li>AUTH REMOVE USER=foo removes this user
+    <li>AUTH REMOVE USER="foo" removes this user
   </ul>
+    Double quotes for user and password are recommended but not required.
+    A double quote inside a user or password must be escaped with a backslash.
+    On failure the server will reply with an I2P_ERROR and a message.
 <li>Multiple concurrent pending STREAM ACCEPTs are allowed on the same session ID (even with the same port).
     Prior to 3.2, concurrent accepts would fail with ALREADY_ACCEPTING.
 <li>The server's control socket may optionally offer SSL/TLS support, as configured on the server and client.
     Implementations may offer other transport layers as well; this is outside the scope of the protocol definition.
 <li>For STREAM FORWARD, client may add SSL=true to use an SSL socket
-<li>New commands QUIT, STOP and EXIT will close the session and socket
+<li>New commands QUIT, STOP and EXIT will close the session and socket. Implementation is optional,
+    for ease in testing via telnet.
+<li>Command parsing will properly handle UTF-8
+<li>Command parsing reliably handles whitespace inside quotes
+<li>A backslash '\' may escape quotes on the command line
+<li>It is recommended but not required that the server map commands to upper case, for ease in testing via telnet.
+    Do not map keys to upper case, as this would corrupt I2CP options.
+<li>Empty option values such as PROTOCOL or PROTOCOL= may be allowed, implementation dependent.
+<li>Servers may implement timeouts for the HELLO or subsequent commands, implementation dependent.
 </ul>
 </p>
 

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

@@ -657,6 +657,7 @@ use the packet's source address and port.
 This message may be sent via IPv4 or IPv6. If IPv6, Alice must include her IPv4 address and port.
 </li><li>
 If Alice includes her address/port, Bob may perform additional validation before continuing.
+Prior to release 0.9.24, Java I2P rejected any address or port that was different from the connection.
 </li><li>
 Challenge is unimplemented, challenge size is always zero
 </li><li>

i2p2www/pages/site/get-involved/donate.html

@@ -73,10 +73,10 @@ mentioned on the I2P webpage.
 <img src="/_static/images/i2pancdonate.2014.png" alt="ANC donation QR code" />
 <br />
 
-<h2><a href="https://getmonero.com/">Monero</a></h2>
+<h2><a href="https://getmonero.org/">Monero</a></h2>
  <p>{% trans date='Nov 2015',
  cointype='Monero',
- coinurl='https://getmonero.com',
+ coinurl='https://getmonero.org',
  account='42oAxV3DVXXG3HhyCyi2xaPukKXbip9Sx1YuJtoCqjZRSze4tYCq7n3VUswDBFV59Zev8yfHSZro4TUwXumtRWnQ8xQipkC' -%}
  As of {{ date }}, echelon has been running a
  <a href="{{ coinurl }}">{{ cointype }}</a> account for the I2P project.