propagate from branch 'i2p.www' (head c34abd2edca6c47a4dd827e3f93d46632c474d7d)

            to branch 'i2p.www.str4d' (head a4c7fb4d1344b1ca5a7c57ae1c42b6214d37362a)

i2p2www/pages/downloads/macros

@@ -2,11 +2,11 @@
 {% set i2pinstall_jar_hash     = '47c9d361940fc429effd57cc6718d72fde7a66663d5dfbb18fa30aba569b69fc' %}
 {% set i2psource_hash          = 'daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236' %}
 {% set i2pupdate_hash          = '5245609257f80ab2177adc50593db239cc6e24bd9e39378c650a34e031451c01' %}
-{% set i2p_android_hash        = 'b14e3cc5ea12eb2e8bccb81dd2e86eeea3baba6695eb1a9f4d9053e76aeb131d' %}
+{% set i2p_android_hash        = 'e5a445cda4e8b2dfc424092c0f2cdebed117dcf0a975b4547c4749e6b9943e06' %}
 
-{% set i2p_android_version = '0.9.22' %}
+{% set i2p_android_version = '0.9.25' %}
 {% set i2p_android_version_kytv = '0.9.22' %}
-{% set i2p_android_version_fdroid = '0.9.22' %}
+{% set i2p_android_version_fdroid = '0.9.25' %}
 
 
 {% macro package_outer(type, name, icon) -%}
@@ -62,8 +62,8 @@
     {%- if type == 'android' %}
       <!-- do not use url_for here -->
       <a class="default" href="https://download.i2p2.de/android/current/i2p.apk">{% trans %}Outside I2P{% endtrans %} ({{ i2p_android_version }})</a>
-      <!-- do not use i2pconv here -->
-      <a class="default" href="http://update.killyourtv.i2p/i2p.apk">{% trans %}Inside I2P{% endtrans %} ({{ i2p_android_version_kytv }})</a>
+      <!-- do not use i2pconv here --><!--
+      <a class="default" href="http://update.killyourtv.i2p/i2p.apk">{% trans %}Inside I2P{% endtrans %} ({{ i2p_android_version_kytv }})</a>-->
       <a class="default" href="https://play.google.com/store/apps/details?id=net.i2p.android">Google Play ({{ i2p_android_version }})</a>
       <a class="default" href="https://f-droid.i2p.io/">{% trans %}Our F-Droid repository{% endtrans %} ({{ i2p_android_version }})</a>
       <a class="default" href="https://f-droid.org/app/net.i2p.android.router">F-Droid ({{ i2p_android_version_fdroid }})</a>

i2p2www/pages/site/about/media.html

 {% extends "global/layout.html" %}
 {% block title %}{{ _('Presentations on I2P') }}{% endblock %}
-{% block lastupdated %}January 2016{% endblock %}
+{% block lastupdated %}April 2016{% endblock %}
 {% block content %}
 <p>{% trans papers=site_url('papers') -%}
 Following are links to presentations, videos, and tutorials about I2P. Links to research papers on I2P are available <a href="{{ papers }}">here</a>.
@@ -106,9 +106,11 @@ Blair Dick, University of Abertay, Dundee Ethical Hacking Society, January 25, 2
 Toronto, August 15-16, 2015
 {%- endtrans %}</li>
 
-<li>{% trans link='https://download.i2p2.de/media/ccc/2015/I2P_Still_alive.pdf' -%}
-<a href="{{ link }}">I2P - Still alive!</a>
-echelon, 32C3 Hamburg, December 28, 2015
+<li>{% trans link='https://download.i2p2.de/media/ccc/2015/I2P_Still_alive.pdf',
+link2='https://fossil.net2o.de/32c3/doc/trunk/wiki/i2p.md' -%}
+<a href="{{ link }}">I2P - Still alive! (pdf)</a>
+<a href="{{ link2 }}">(video)</a>
+echelon, 32C3 (You Broke the Internet Assembly), Hamburg, December 28, 2015
 {%- endtrans %}</li>
 
 <li>{% trans link='https://download.i2p2.de/media/rwc/2016/rwc2016-str4d-slides.pdf',

i2p2www/pages/site/about/team.html

@@ -11,7 +11,7 @@ network.
 
 <table border="0">
 <tr>
-	<td valign="top" rowspan="29"><b>{{ _('Admin') }}</b></td>
+	<td valign="top" rowspan="31"><b>{{ _('Admin') }}</b></td>
 	<td valign="top"><b>{{ _('Project Manager') }}</b></td>
 	<td valign="top">zzz</td>
 	<td valign="top"><i>{{ _('point of contact of last resort') }}</i></td>
@@ -58,12 +58,12 @@ network.
 </tr>
 <tr>
 	<td valign="top"><b>{{ _('Packager; Linux') }}</b></td>
-	<td valign="top">KillYourTV</td>
+	<td valign="top">zzz</td>
 	<td valign="top"><i>{{ _('Linux (Debian/Ubuntu) distribution packager') }}</i></td>
 </tr>
 <tr>
 	<td valign="top"><b>{{ _('Packager; Windows') }}</b></td>
-	<td valign="top">KillYourTV</td>
+	<td valign="top">zzz</td>
 	<td valign="top"><i>{{ _('Windows installer packager') }}</i></td>
 </tr>
 <tr>
@@ -76,9 +76,19 @@ network.
         <td valign="top">eche|on, kytv, str4d</td>
 	<td valign="top"><i>{{ _('Backup release managers') }}</i></td>
 </tr>
+<tr>
+	<td valign="top"><b>{{ _('Tails Maintainer') }}</b></td>
+	<td valign="top">pr0ng</td>
+	<td valign="top"><i>{{ _('Maintain the I2P package in Tails') }}</i></td>
+</tr>
+<tr>
+	<td valign="top"><b>{{ _('CI admin') }}</b></td>
+	<td valign="top" class="blue">[{{ _('vacant') }}]</td>
+	<td valign="top"><i>{{ _('Maintain the Continuous Integration infrastructure') }}</i></td>
+</tr>
 <tr>
 	<td valign="top"><b>{{ _('Update admin') }}</b></td>
-	<td valign="top">KillYourTV</td>
+	<td valign="top" class="blue">[{{ _('vacant') }}]</td>
 	<td valign="top"><i>{{ _('Monitors and recruits in-network update hosts') }}</i></td>
 </tr>
 <tr>
@@ -93,7 +103,7 @@ network.
 </tr>
 <tr>
 	<td valign="top"><b><a href="https://trac.i2p2.de/">Trac</a> admin</b></td>
-	<td valign="top">KillYourTV</td>
+	<td valign="top">Meeh</td>
 	<td valign="top"><i>{{ _('Manage the project bug tracker') }}</i></td>
 </tr>
 <tr>
@@ -103,7 +113,7 @@ network.
 </tr>
 <tr>
         <td valign="top"><b>{{ _('Translation admins') }}</b></td>
-	<td valign="top">eche|on, HungryHobo, KillYourTV, str4d, zzz</td>
+	<td valign="top">eche|on, str4d, zzz</td>
 	<td valign="top">Admins on <a href="https://www.transifex.com/projects/p/I2P/">Transifex</a></td>
 </tr>
 <tr>
@@ -254,7 +264,7 @@ network.
 	<td valign="top"><i>{{ _('desktopgui, dijjer port') }}</i></td>
 </tr>
 <tr>
-	<td valign="top">KillYourTV</td>
+	<td valign="top">zzz</td>
 	<td valign="top"><i>{{ _('Debian/Ubuntu Packager and PPA maintainer') }}</i></td>
 </tr>
 <tr>

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

@@ -14,7 +14,7 @@ Note that we do not have a particular target for numbering a release as "1.0".
 We plan to continue numbering releases as 0.9.x for now.
 We do not maintain separate unstable and stable branches or releases.
 We have a single, stable release path.
-Our normal release cycle is 6-10 weeks.
+Our normal release cycle is 8-10 weeks.
 </p>
 
 
@@ -70,7 +70,7 @@ Bug fixes, translation updates, geoip updates
 
 
 <h2 id="v0.9.26">0.9.26</h2>
-<p><b>Target release date: May 2016</b></p>
+<p><b>Target release date: Early June 2016</b></p>
 <ul><li>
 New subscription protocol, addressbook support
 </li><li>
@@ -92,7 +92,7 @@ Bug fixes, translation updates, geoip updates
 
 
 <h2 id="v0.9.27">0.9.27</h2>
-<p><b>Target release date: July 2016</b></p>
+<p><b>Target release date: Late August 2016</b></p>
 <ul><li>
 Crypto migration for existing hidden services
 </li><li>
@@ -106,7 +106,7 @@ Initial work on Pluggable transports
 
 
 <h2 id="v0.9.28">0.9.28</h2>
-<p><b>Target release date: September 2016</b></p>
+<p><b>Target release date: Late October / Early November 2016</b></p>
 <ul><li>
 Further work on transports: DH/NTCP2/PT
 </li><li>
@@ -120,7 +120,7 @@ Console redesign phase 1
 
 
 <h2 id="v0.9.29">0.9.29</h2>
-<p><b>Target release date: November 2016</b></p>
+<p><b>Target release date: Mid-January 2017</b></p>
 <ul><li>
 GMP 6.1
 </li><li>
@@ -157,7 +157,7 @@ Bug fixes, translation updates, geoip updates
 
 
 
-<h2 id="2017">2017</h2>
+<h2 id="2017">0.9.30+ (2017)</h2>
 <ul>
 <li>
 New crypto