Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.www into Shoalsteed/master

i2p2www/pages/downloads/list.html

@@ -84,7 +84,7 @@ If you would like to try the latest experimental I2P projects, visit the <a href
     {% call package('android') %}
     <div class="warning">
         {% trans -%} Requires Android 4.0 (Ice Cream Sandwich) or higher. If you earlier installed I2P, unfortunately this release fixes some IPC issues which will force you to uninstall your current installation before installing this. {%- endtrans %} {% trans
-        -%} 512 MB RAM minimum; 1 GB recommended. {%- endtrans %} {% trans -%} The releases are not compatible with eachother, as they have different signatures. Uninstall them completely before installing any other version. The apk's from download.i2p2.de
+        -%} 512 MB RAM minimum; 1 GB recommended. {%- endtrans %} {% trans -%} The releases are not compatible with eachother, as they have different signatures. Uninstall them completely before installing any other version. The apk's from download.i2p2.no
         are signed by idk. {%- endtrans %}
     </div>
     {% endcall %}

i2p2www/pages/site/about/i2pcon/2015.html

@@ -178,8 +178,8 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:5f0396645c3588252ac1e0adfd11eca5da96a1f8&amp;dn=20150815_01Intro_I2PCon480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:5f0396645c3588252ac1e0adfd11eca5da96a1f8&amp;dn=20150815_01Intro_I2PCon480p.mp4magnet:?xt=urn:btih:e16f0835c5468cfc5dc8142daa6b90cac7847845&amp;dn=20150815_04PanelDiscussion_I2PCon480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(125MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-Intro.pdf">pdf</a></td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-Intro.odp">odp</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-Intro.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-Intro.odp">odp</a></td>
 
 </tr><tr>
 <td>TOS and PII - What happens to your data when the company gets bought and sold?</td>
@@ -191,7 +191,7 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:a4975953d9c231facbd3c736677243d4f24c812e&amp;dn=20150815_02NickJohnston_TOSvsPII_I2PCon480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:a4975953d9c231facbd3c736677243d4f24c812e&amp;dn=20150815_02NickJohnston_TOSvsPII_I2PCon480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(202MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-NickJohnston-WebsiteTOSvsYourPII.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-NickJohnston-WebsiteTOSvsYourPII.pdf">pdf</a></td>
 <td align="center">--</td>
 
 </tr><tr>
@@ -204,8 +204,8 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:bc7408733e4a218eba633686aa80ea6eadef9e36&amp;dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:bc7408733e4a218eba633686aa80ea6eadef9e36&amp;dn=20150815_03zzz_GrowingNetworkSpreadingWord_I2PCon480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(249MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-GrowingTheNetwork.pdf">pdf</a></td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-GrowingTheNetwork.odp">odp</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-GrowingTheNetwork.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-GrowingTheNetwork.odp">odp</a></td>
 
 </tr><tr>
 <td>Roundtable Discussion</td>
@@ -257,7 +257,7 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:f92d674c1c34ceaca1ca6c9b309a82894acdb661&amp;dn=20150816_05I2PMonitoringFiltration_I2PCon_480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:f92d674c1c34ceaca1ca6c9b309a82894acdb661&amp;dn=20150816_05I2PMonitoringFiltration_I2PCon_480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(307MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-dagon-MonitoringAndFiltration.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-dagon-MonitoringAndFiltration.pdf">pdf</a></td>
 <td align="center">--</td>
 
 </tr><tr>
@@ -269,8 +269,8 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:ac79089ef2bd7dcf34dc0549ac8e16261996f584&amp;dn=20150816_06ConnectionLimitChallenge_I2PCon_480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:ac79089ef2bd7dcf34dc0549ac8e16261996f584&amp;dn=20150816_06ConnectionLimitChallenge_I2PCon_480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(265MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-ConnectionLimitChallenge.pdf">pdf</a></td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-ConnectionLimitChallenge.odp">odp</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-ConnectionLimitChallenge.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-ConnectionLimitChallenge.odp">odp</a></td>
 
 </tr><tr>
 <td>Hello from Lance</td>
@@ -295,7 +295,7 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:c6d18a1ed3eefe07dd578ed4314e5af72ac4423d&amp;dn=20150816_08Psi_I2PAppDevIntro_480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:c6d18a1ed3eefe07dd578ed4314e5af72ac4423d&amp;dn=20150816_08Psi_I2PAppDevIntro_480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(108MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-psi-AppDevIntro.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-psi-AppDevIntro.pdf">pdf</a></td>
 <td align="center">--</td>
 
 </tr><tr>
@@ -308,24 +308,24 @@ Zzz is an I2P developer.
 <td align="center"><a href="magnet:?xt=urn:btih:5314c5b181d1a85b7c4decb4b307fe1c9e5fdc54&amp;dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon_480p.mp4&amp;tr=http://tracker2.postman.i2p/announce.php">I2P magnet link</a><br />
                    <a href="magnet:?xt=urn:btih:5314c5b181d1a85b7c4decb4b307fe1c9e5fdc54&amp;dn=20150816_09str4d_AgonyEcstasyofI2POnAndroid_I2PCon_480p.mp4&amp;tr=udp%3A%2F%2Ftracker.internetwarriors.net%3A1337&amp;tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&amp;tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&amp;tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&amp;tr=udp%3A%2F%2Fopen.demonii.com%3A1337">Non-private internet magnet link</a><br />(156MB)
 </td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-str4d-Android.pdf">pdf</a></td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-str4d-Android.odp">odp</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-str4d-Android.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-str4d-Android.odp">odp</a></td>
 
 </tr><tr>
 <td>HORNET Overview</td>
 <td>str4d</td>
 <td align="center">--</td>
 <td align="center">--</td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-str4d-HORNET.pdf">pdf</a></td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-str4d-HORNET.odp">odp</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-str4d-HORNET.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-str4d-HORNET.odp">odp</a></td>
 
 </tr><tr>
 <td>Roadmap and Organizational Meetings</td>
 <td>zzz</td>
 <td align="center">--</td>
 <td align="center">--</td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-RoadmapAndOrganizationMeetings.pdf">pdf</a></td>
-<td align="center"><a href="https://download.i2p2.de/media/i2pcon/2015/slides/I2PCon-2015-zzz-RoadmapAndOrganizationMeetings.odp">odp</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-RoadmapAndOrganizationMeetings.pdf">pdf</a></td>
+<td align="center"><a href="https://download.i2p2.no/media/i2pcon/2015/slides/I2PCon-2015-zzz-RoadmapAndOrganizationMeetings.odp">odp</a></td>
 
 </table>
 

i2p2www/pages/site/about/media.html

@@ -103,15 +103,15 @@ 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',
+<li>{% trans link='https://download.i2p2.no/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',
-link2='https://download.i2p2.de/media/rwc/2016/rwc2016-str4d-slides.odp' -%}
+<li>{% trans link='https://download.i2p2.no/media/rwc/2016/rwc2016-str4d-slides.pdf',
+link2='https://download.i2p2.no/media/rwc/2016/rwc2016-str4d-slides.odp' -%}
 Replacing Weary Crypto: Upgrading the I2P network with stronger primitives
 <a href="{{ link }}">(pdf)</a>
 <a href="{{ link2 }}">(odp)</a>