merge of '34e325a4afaeb7239c682dd744ac1aa0e79f3733'

     and 'd474b07493d0de5240c622c27f4a64f6ea8e7267'

i2p2www/pages/downloads/debian.html

@@ -94,20 +94,34 @@ For Wheezy:<br>
     <code>deb https://deb.i2p2.de/ wheezy main
     deb-src https://deb.i2p2.de/ wheezy main</code>
 </pre>
+
 <br />
 For Jessie (stable):<br />
 <pre>
     <code>deb https://deb.i2p2.de/ jessie main
     deb-src https://deb.i2p2.de/ jessie main</code>
 </pre>
+
+<br />
+For Stretch (not available until I2P 0.9.30):<br />
+<pre>
+     <code>deb https://deb.i2p2.de/ stretch main
+     deb-src https://deb.i2p2.de/ stretch main</code>
+</pre>
+
 <br />
-For Testing (Stretch) or Unstable (Sid):<br />
+For Stretch (I2P development builds for testing):<br />
+<pre>
+     <code>deb https://deb.i2p2.de/ stretch-testing main
+     deb-src https://deb.i2p2.de/ stretch-testing main</code>
+</pre>
+
+<br />
+For Testing or Unstable (Sid) (will not work until I2P 0.9.30):<br />
 <pre>
      <code>deb https://deb.i2p2.de/ unstable main
      deb-src https://deb.i2p2.de/ unstable main</code>
 </pre>
-Attention! Currently I2P 0.9.29 depends on Jetty8, which is not installable on Debian Stretch. So I2P is not installable yet in Debian Stretch, we work on getting it fixed.
-Also I2P Repo needs the https-transport, which is installed via sudo apt-get install apt-transport-https.
   </li>
 
   <li>{% trans repokey=url_for('static', filename='i2p-debian-repo.key.asc') -%}
@@ -132,9 +146,23 @@ package will ensure that you receive updates to the repository's GPG key.
     <code>&nbsp;&nbsp;&nbsp; apt-get install i2p i2p-keyring</code></li>
 </ol>
 
+<p>
 {% trans -%}
 After the installation process completes you can move on to the next part of <a href="#Post-install_work">starting I2P</a> and configuring it for your system.
 {%- endtrans %}
+</p>
+
+<p>
+{% trans -%}
+Note: If the https address does not work, either:
+{%- endtrans %}
+<ol><li><code>sudo apt-get install apt-transport-https</code></li>
+<li>
+{% trans -%}
+Change the repository address to http://deb.i2p2.no/
+{%- endtrans %}
+</li></ol>
+</p>
 
 <h2 id="Post-install_work">{{ _('Post-install work') }}</h2>
 

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

 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Secure Semireliable UDP{% endtrans %} (SSU){% endblock %}
-{% block lastupdated %}{% trans %}October 2016{% endtrans %}{% endblock %}
-{% block accuratefor %}0.9.28{% endblock %}
+{% block lastupdated %}{% trans %}April 2017{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.30{% endblock %}
 {% block content %}
 
 <p>{% trans transports=site_url('docs/transport'), ntcp=site_url('docs/transport/ntcp') -%}
@@ -48,6 +48,11 @@ The following properties are stored in the network database.
 </li><li><b>host:</b> IP (IPv4 or IPv6) or host name.
   Shortened IPv6 address (with "::") is allowed.
   May or may not be present if firewalled.
+</li><li><b>iexp[0-2]:</b> Expiration of this introducer.
+  ASCII digits, in seconds since the epoch.
+  Only present if firewalled, and introducers are required.
+  Optional (even if other properties for this introducer are present).
+  As of release 0.9.30, proposal 133.
 </li><li><b>ihost[0-2]:</b> Introducer's IP (IPv4 or IPv6) or host name.
   Shortened IPv6 address (with "::") is allowed.
   Only present if firewalled, and introducers are required.

i2p2www/spec/cryptography.rst

@@ -15,7 +15,7 @@ Overview
 This page specifies the low-level details of the cryptography in I2P.
 
 There are a handful of cryptographic algorithms in use within I2P, but we have
-reduced them to a bare minimum to deal with our needs - one symmetric algorithm
+reduced them to a bare minimum to deal with our needs - one symmetric algorithm,
 one asymmetric algorithm, one signing algorithm, and one hashing algorithm.
 However, we do combine them in some particular ways to provide message
 integrity (rather than relying on a MAC).  In addition, as much as we hate

i2p2www/spec/proposals/133-introducer-expiration.rst

@@ -5,8 +5,10 @@ Introducer Expiration
     :author: zzz
     :created: 2017-02-05
     :thread: http://zzz.i2p/topics/2230
-    :lastupdated: 2017-04-07
-    :status: Open
+    :lastupdated: 2017-04-13
+    :status: Closed
+    :target: 0.9.30
+    :implementedin: 0.9.30
 
 .. contents::