From b26c7fef94fdefc172b73637b87aacf879d7ee57 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 7 Mar 2016 16:03:08 +0000
Subject: [PATCH 01/11] 0.9.26 roadmap update Add delivery time for stickers

---
 i2p2www/pages/site/get-involved/donate.html  |  3 +++
 i2p2www/pages/site/get-involved/roadmap.html | 16 +++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/i2p2www/pages/site/get-involved/donate.html b/i2p2www/pages/site/get-involved/donate.html
index b346ab8b..72207f49 100644
--- a/i2p2www/pages/site/get-involved/donate.html
+++ b/i2p2www/pages/site/get-involved/donate.html
@@ -22,6 +22,9 @@ You must include "stickers please" and your address in the Paypal comments.
 For other payment methods, follow up with an email to eche|on
 with the subject "stickers please", your payment information, and your address.
 {%- endtrans %}</p>
+<p><i>{% trans -%}
+Please allow 30-60 days for delivery.
+{%- endtrans %}</i></p>
 
 <h2><a href="https://bitcoin.org/">Bitcoin</a></h2>
 <p>{% trans date='December 2010',
diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 7fb474aa..8f868ec0 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -47,17 +47,15 @@ Bug fixes, translation updates, geoip updates
 
 
 <h2 id="v0.9.25">0.9.25</h2>
-<p><b>Target release date: mid-to-late March 2016</b></p>
+<p><b>Target release date: mid-March 2016</b></p>
 <ul><li>
-Wrapper 3.5.27
-</li><li>
 SAM v3.3
 </li><li>
 Sybil tool enhancements
 </li><li>
 QR codes and identicons
 </li><li>
-Crypto enhancements and speedups
+Crypto speedups
 </li><li>
 Router family configuration UI
 </li><li>
@@ -74,15 +72,15 @@ Bug fixes, translation updates, geoip updates
 <ul><li>
 New subscription protocol, addressbook support
 </li><li>
+Wrapper 3.5.27
+</li><li>
 GMP 6.0
 </li><li>
-Sybil tool migration to automatic?
-</li><li>
-Streaming improvements
-</li><li>
-Certificate revocations (CRL) ?
+Sybil tool enhancements
 </li><li>
+Streaming test harness
 </li><li>
+Certificate revocations in the news feed
 </li><li>
 Bug fixes, translation updates, geoip updates
 </li></ul>

From 1f5edd3b473f6ebd5eb86e8985897a3805d2ce0c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 10 Mar 2016 14:54:29 +0000
Subject: [PATCH 02/11] Add proposed spec for CRLs in news feed

---
 i2p2www/pages/site/docs/spec/updates.html | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/i2p2www/pages/site/docs/spec/updates.html b/i2p2www/pages/site/docs/spec/updates.html
index bde99bf3..0c026045 100644
--- a/i2p2www/pages/site/docs/spec/updates.html
+++ b/i2p2www/pages/site/docs/spec/updates.html
@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}I2P Software Update Specification{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}May 2015{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.20{% endblock %}
+{% block lastupdated %}{% trans %}March 2016{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.25{% endblock %}
 {% block content %}
 <h3>{% trans %}Overview{% endtrans %}</h3>
 <p>{% trans -%}
@@ -481,6 +481,8 @@ The following &lt;feed&gt; elements are used:
 </li><li>
 &lt;i2p:release&gt; I2P update metadata. See below.
 </li><li>
+&lt;i2p:revocations&gt; Certificate revocations. See below.
+</li><li>
 &lt;updated&gt; Timestamp for the feed (conforming to
 <a href="http://tools.ietf.org/html/rfc4287">RFC 4287 (Atom) section 3.3</a> and
 <a href="http://tools.ietf.org/html/rfc3339">RFC 3339</a>. (required)
@@ -559,6 +561,34 @@ If a router is older than this, the user must (manually?) update to an intermedi
 
 
 
+<p><b>Atom &lt;i2p:revocations&gt; Details:</b></p>
+<p>
+This entity is optional and there is at most one &lt;i2p:revocations&gt; entity in the feed.
+This feature is scheduled for implementation in release 0.9.26.
+The specification below is preliminary and subject to change.
+</p><p>
+The &lt;i2p:revocations&gt; entity contains
+one or more &lt;i2p:crl&gt; entities.
+The &lt;i2p:crl&gt; entity
+contains the following attributes and content:
+</p>
+<ul><li>
+date (attribute): Timestamp for this entry (conforming to
+<a href="http://tools.ietf.org/html/rfc4287">RFC 4287 (Atom) section 3.3</a> and
+<a href="http://tools.ietf.org/html/rfc3339">RFC 3339</a>. (required)
+The date also may be in truncated format yyyy-mm-dd (without the 'T'); this is the "full-date" format in RFC 3339.
+In this format the time is assumed to be 00:00:00 UTC for any processing.
+</li><li>
+id (attribute): A unique id for the creator of this CRL.
+</li><li>
+The content of the entity is
+a standard base 64 encoded Certificate Revocation List (CRL) with newlines, starting with the line
+'<tt>-----BEGIN X509 CRL-----</tt>' and ending with the line '<tt>-----END X509 CRL-----</tt>'.
+See <a href="https://tools.ietf.org/html/rfc5280">RFC 5280</a> for more information on CRLs.
+</li></ul>
+
+
+
 <h3>{% trans %}Future Work{% endtrans %}</h3>
 <ul>
 <li>{% trans -%}

From a38d08083c041904628f393ce7b4ec0ac4c58cea Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 12 Mar 2016 14:12:45 +0000
Subject: [PATCH 03/11] hosts.txt add secure.tinhat.i2p and zerobin.i2p

---
 i2p2www/static/hosts.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/i2p2www/static/hosts.txt b/i2p2www/static/hosts.txt
index 34987b08..3af47e34 100644
--- a/i2p2www/static/hosts.txt
+++ b/i2p2www/static/hosts.txt
@@ -364,3 +364,5 @@ i2pnews.i2p=XHS99uhrvijk3KxU438LjNf-SMXXiNXsbV8uwHFXdqsDsHPZRdc6LH-hEMGWDR5g2b65
 exchanged.i2p=rLFzsOqsfSmJZvg6xvl~ctUulYWwGaM8K~rGs-e4WXkKePTCMOpU8l6LIU-wwDOiUZ7Ve8Y-zWPBVYQjH8~~lgT-BJ81zjP5I6H051KOVaXDChdx5F99mZu0sEjnYoFX484QHsUkFc5GUypqhpv1iwWwdPL7bVNzr1fS6sIZvq7tYWEOymbnifxk2jC0BnjultNPCq1wiI2Y-G66iOHDvuLu5f7RvNGJYlpw0UYNv6g8jUu3gXYjDRMBD5OIxFUJaksfmml2CiaGjrPfXKEXBR4q1CogVruq3r~447VHb32f52aeYszcslNzQjYyFCdipnAi5JiNTFpzTZPMEglt2J3KZYB3SMCmxSLktFI7376c7mT7EbMIFFv1GrmcUy9oIyYasbb82Sec9y0nJ9ahZt0x3iGokAYekXKXq-rGPzgFeBwfuCHzQnLzm1akVyJHoGDdaG0QHJfqfW1sY3F2n1xaWrnKcqIz2ypemxVnTMFKQqm2pdG-dMsXNYiGmZtaBQAEAAcAAA==
 i2pwiki.i2p=Zr1YUKIKooxymZRqLvtfSYuZggqv5txkLE8Ks~FTh3A8JDmhOV8C82dUBKJhzst~Pcbqz7rXc~TPyrqasaQ~LioAji~WLSs8PpmCLVF83edhYpx75Fp23ELboEszHduhKWuibVchPLNa-6nP4F0Ttcr4krTlphe3KveNfZDAbm511zFFlNzPcY4PqOdCRBrp7INiWkVwQxwGWO7jiNYTYa5x4QXJmxIN1YOiNRYQST7THz1aV6219ThsfT9FE5JtiX-epli6PF5ZX9TcVSjHUKZnr8uJLXfh5T4RMVNe1n~KXutMUZwxpFE0scOIez9vhDFd7t0HPIsQUsv7MUBzrz4FM9qol7UUPueSGDRgTOOfXMfj4BDsouiWQC4GcSmH3SflR0Ith9QWKC4u3XYvB7Tw-70QWBEV53hUo6I8YKidV13WgeN9JI3KWTYkMyX-TYjmY9y2q6Xd-Maszv4Tb~NzxQs9CNdu0W-JRSUFOqzgt3l4cx0K1pmx4p0tM5dLBQAEAAEAAA==
 lenta.i2p=DnW8NqbKilYLcIx5g5CG4mWVHkzrCkl0MbV4a5rGJku4BSs7HjvzjZpCoXWFky9JCUlHzjFotMETxQBhaKl0Q46vu-plKQ4BLnYyo45p7j2lTiejWvV4SDuXU4IAdmug27i~Jl4N44zwe9KYy~gMfY1Vsgv4bH9ov7X7l2iS-bycfcd9nE7JfycwFc4e0XU-dx7xf~tHw7I5--25dp-SsRX3-UYz4ygb58aD8UsKfQaFZtMy4x~Z1ufNEftuekb1HH9g2Rhhq8Bl62ad8PWSDa9Ne-SkCQsqTYjrCsvMY2DMvWgmZxI1hJYqzjRdFV6JEprrr~CJgHGJXr~KdnZhX12Vm4bKisZK847wBm42CoBQBT5HRzDkeflkbsliirRuKSUxVYMoZ1vic~avPZZl~pvIKZsz-YtiKha4vjCNE1zD-tHIS~2qq4uEO546Ol9pNokPaNttV6r7D2-zurEDx~9grJ8LhBozTxtdTdfZv2OqN4bVhrE7xUrxe0flIFKEAAAA
+secure.thetinhat.i2p=0ncSrtVS20zwfcM7h2S6SSF56uVM2bftQwf40jsWKASNQnzyDVEzXpS04y-DJpm9EwKMGkgvx8ICBX-80W4E9xPJEdGFbb2u34fWmpTVMc3vwwB9ywmSXoxFbwiFx2sm7-HCcdALZwrjU3J41AfBvpEVkB5dXklTZIh~bU0JBTK2JIvQMD0XrSOztEruTc5kYymtkiCUpJaJJFXyIM3lKRcNlZ76UidE8AyQxHX7s9OR02pk7FhYV8Uh-Bs8loAZg6IPZzoYnnBYyi--b1-N8Ipv3aKmqSZPbQEzfQxU8-BE74xBLNEWAJtB8ptKMiKfHphO7qDKWqTzOU-7BtGXZAEOA3oblRAQcgqUbi~aICj0V0MAuYAdj7f-8BIi2k3Qfcl6k6XOFEpZqYFle71LeCjIZN~0mDDzxlr0Scx6LKMGnQAtYlGXFq99urp1MutPDZEu47mdxGWqc9CoNNNsE2UgS9ykvWygefNpZhkmceBXmDxWhuAPD1M2~eNF-fCMBQAIAAMAADZv~vU=
+zerobin.i2p=Jf64hlpW8ILKZGDe61ljHU5wzmUYwN2klOyhM2iR-8VkUEVgDZRuaToRlXIFW4k5J1ccTzGzMxR518BkCAE3jCFIyrbF0MjQDuXO5cwmqfBFWrIv72xgKDizu3HytE4vOF2M730rv8epSNPAJg6OpyXkf5UQW96kgL8SWcxWdTbKU-O8IpE3O01Oc6j0fp1E4wVOci7qIL8UEloNN~mulgka69MkR0uEtXWOXd6wvBjLNrZgdZi7XtT4QlDjx13jr7RGpZBJAUkk~8gLqgJwoUYhbfM7x564PIn3IlMXHK5AKRVxAbCQ5GkS8KdkvNL7FsQ~EiElGzZId4wenraHMHL0destUDmuwGdHKA7YdtovXD~OnaBvIbl36iuIduZnGKPEBD31hVLdJuVId9RND7lQy5BZJHQss5HSxMWTszAnWJDwmxqzMHHCiL6BMpZnkz8znwPDSkUwEs3P6-ba7mDKKt8EPCG0nM6l~BvPl2OKQIBhXIxJLOOavGyqmmYmAAAA

From 764e5252cff1ab0fbd72a1492978d03f29de7b03 Mon Sep 17 00:00:00 2001
From: echelon2 <echelon2@mail.i2p>
Date: Sat, 12 Mar 2016 16:39:44 +0000
Subject: [PATCH 04/11] updated hall of fame to 6th march 2016

---
 i2p2www/pages/site/about/hall-of-fame.html | 75 ++++++++++++++++++++--
 1 file changed, 71 insertions(+), 4 deletions(-)

diff --git a/i2p2www/pages/site/about/hall-of-fame.html b/i2p2www/pages/site/about/hall-of-fame.html
index 2795df52..5e332a02 100644
--- a/i2p2www/pages/site/about/hall-of-fame.html
+++ b/i2p2www/pages/site/about/hall-of-fame.html
@@ -1,12 +1,13 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Hall Of Fame') }}{% endblock %}
 {% block content %}
-<!-- file version 2015.12.01.01 -->
-<b>{% trans date='2015-12-01' -%}
+<!-- file version 2016.03.06.01 -->
+<b>{% trans date='2016-03-06' -%}
 Current balance: as of {{ date }}
 {%- endtrans %}</b><br />
 <b>{{ _('General fund') }}:
-{% trans euroval='38838,28', btcval='516,95196524' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
+{% trans euroval='34804,96', btcval='519,24765865' %}{{ euroval }} &euro; and {{ btcval }} BTC{% endtrans %}</b><br />
+{% trans ltcval='703,981', xmzval='1174,3857125758' %}{{ ltcval }} LTC; and {{ xmzval }} XMZ{% 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>:
@@ -45,6 +46,45 @@ with your name or nick (and optionally homepage) so we can list you here.
 </table>
 <br />
 
+<b>{{ _('2016 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, 2016</td><td>donation Alex</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>I2P root server</td><td></td><td>660 &euro;</td><td>General fund</td></tr>
+ <tr><td>Jan, 2016</td><td>donation Alex</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>support echelon EasterHegg 2016</td><td></td><td>200 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>donation ComeIn3s</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>support reseed server</td><td></td><td>80 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>I2P stickers</td><td></td><td>500 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>I2P DNS entries</td><td></td><td>59,50 &euro;</td><td>general fund</td></tr>
+ <tr><td>Jan, 2016</td><td>support echelon 2015</td><td></td><td>300 &euro;</td><td>general fund</td></tr>
+ 
+ <tr><td>Jan, 2016</td><td>anonymous</td><td>0.01173000 BTC</td><td></td><td>General fund</td></tr>
+ 
+ <tr><td>Feb, 2016</td><td>donation Alex</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Feb, 2016</td><td>donation Flattr 2015</td><td>160 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Feb, 2016</td><td>donation Alex</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Feb, 2016</td><td>donation ComeIn3s</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Feb, 2016</td><td>donation</td><td>2 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Feb, 2016</td><td>donation</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ <tr><td>Feb, 2016</td><td>I2P DNS entries</td><td></td><td>11,90 &euro;</td><td>general fund</td></tr>
+ 
+ <tr><td>Feb, 2016</td><td>anonymous</td><td>0.02276341 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2016</td><td>anonymous</td><td>0.00050000 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2016</td><td>anonymous</td><td>0.01332000 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2016</td><td>anonymous</td><td>0.00010000 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2016</td><td>anonymous</td><td>0.00020000 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Feb, 2016</td><td>anonymous</td><td>0.00058000 BTC</td><td></td><td>General fund</td></tr>
+ 
+ <tr><td>Mar, 2016</td><td>I2P stickers postal costs</td><td></td><td>100 &euro;</td><td>general fund</td></tr>
+ <tr><td>Mar, 2016</td><td>donation Alex</td><td>10 &euro;</td><td></td><td>general fund</td></tr>
+ 
+ <tr><td>Mar, 2016</td><td>refund 32C3 travel support</td><td>2.24350000 BTC</td><td></td><td>General fund</td></tr>
+ <tr><td>Mar, 2016</td><td>anonymous</td><td>0.00300000 BTC</td><td></td><td>General fund</td></tr>
+ 
+ 
+</table> 
+
 <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>
@@ -173,12 +213,39 @@ with your name or nick (and optionally homepage) so we can list you here.
  <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>Nov, 2015</td><td>anoymous</td><td>5 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>anoymous</td><td>20 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>anoymous</td><td>3,9821674258 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>anoymous</td><td>20 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Nov, 2015</td><td>anoymous</td><td>50 XMZ</td><td></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>
 
+ <tr><td>Dec, 2015</td><td>Alex</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>TimeTravelDuck</td><td>10 &euro;</td><td></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>
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>3 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>ComeIn3s</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>Dr.Wax</td><td>10 &euro;</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>foebrian</td><td>20 &euro;</td><td></td><td>General fund</td></tr>
+ 
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>1 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>2,40354515 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>10 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>1000 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>40 XMZ</td><td></td><td>General fund</td></tr>
+ <tr><td>Dec, 2015</td><td>anoymous</td><td>22 XMZ</td><td></td><td>General fund</td></tr>
+ 
+ <tr><td>Dec, 2015</td><td>32C3 I2P Dinner</td><td></td><td>240 &euro;</td><td>general fund</td></tr>
+ <tr><td>Dec, 2015</td><td>32C3 tickets</td><td></td><td>90 &e