diff --git a/i2p2www/pages/downloads/debian.html b/i2p2www/pages/downloads/debian.html index 17a6e9b9..f306a05b 100644 --- a/i2p2www/pages/downloads/debian.html +++ b/i2p2www/pages/downloads/debian.html @@ -8,14 +8,10 @@ The packages hosted on Ubuntu (Hardy 8.04 and newer){% endtrans %} -
i2p
and press enter. When i2p
is returned in the results list, right click i2p
and select Mark for Installation. After doing so you may see a Mark additional required changes? popup. If so, click Mark then Apply.
{%- endtrans %}
({% trans %}For Squeeze you can follow the instructions here.{% endtrans %})
+ {% trans -%} The steps below should be performed with root access (i.e., switching user to root with "su" or by prefixing each command with "sudo"). @@ -97,13 +95,9 @@ user to root with "su" or by prefixing each command with "sudo")./etc/apt/sources.list.d/i2p.list
{% endtrans %} deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main
- deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main
deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main
- deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu precise main
/etc/apt/sources.list.d/i2p.list
{% endtrans %} deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main
+ deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main
su
" or by prefixing each command with "sud
{%- endtrans %}
-
- {% trans -%}
- Download the i2p-router package from the PPA.
+ {% trans ppa='http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu/pool/main/i/i2p/',
+kytv='http://'+i2pconv('killyourtv.i2p')+'/debian/' -%}
+Download the i2p-router package from the PPA.
+Alternatively, there are unofficial packages available here for
armel, armhf, and kfreebsd
.
{%- endtrans %}
-
diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index 53b456bb..513ce85a 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -23,12 +23,12 @@ or type java -version at your command prompt.
Windows
- i2pinstall_{{ ver() }}_windows.exe (Google Code)
- ({{ _('select alternate link') }})
+ i2pinstall_0.9.5-win1_windows.exe (Google Code)
+ ({{ _('select alternate link') }})
diff --git a/i2p2www/pages/include/monotonerc.html b/i2p2www/pages/include/monotonerc.html
index 6e7cd75b..7162b37b 100644
--- a/i2p2www/pages/include/monotonerc.html
+++ b/i2p2www/pages/include/monotonerc.html
@@ -69,6 +69,7 @@ function get_revision_cert_trust(signers, id, name, val)
"01265f0c817b24548478341fb75e672720a78b21", -- str4d@mail.i2p
"38fe2aa37e1eb9a300a2061ef153265c48031c6b", -- walking@mail.i2p
"a0eb78d437efad120dd9edcd776a327ec2c2adde", -- zab@mail.i2p
+ "2158706490e62a17c8140b6e9eabca965b681bc7", -- zab2@mail.i2p
"896e399990704373125f782ae2ee19b6611ac612" -- zzz@mail.i2p
}
local t = keyintersection(signers, trusted_signers)
diff --git a/i2p2www/pages/site/about/hall-of-fame.html b/i2p2www/pages/site/about/hall-of-fame.html
index e1e91bf9..be1615c3 100644
--- a/i2p2www/pages/site/about/hall-of-fame.html
+++ b/i2p2www/pages/site/about/hall-of-fame.html
@@ -1,13 +1,13 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('Hall Of Fame') }}{% endblock %}
{% block content %}
-
+
{% trans %}I2P's Hall of Fame{% endtrans %}
-{% trans date='2013-03-01' -%}
+{% trans date='2013-05-01' -%}
Current balance: as of {{ date }}
{%- endtrans %}
{{ _('General fund') }}:
-{% trans euroval='5940,28', btcval='1222,87398130' %}{{ euroval }} € and {{ btcval }} BTC{% endtrans %}
+{% trans euroval='28078,57', btcval='626,04640057' %}{{ euroval }} € and {{ btcval }} BTC{% endtrans %}
{{ _('Datastorage bounty') }}:
{% trans euroval='145.0', btcval='2' %}{{ euroval }} € and {{ btcval }} BTC{% endtrans %}
{{ _('Native IPv6 I2P') }}:
@@ -17,11 +17,12 @@ Current balance: as of {{ date }}
{{ _('I2P in debian mirrors') }}:
{% trans euroval='123.0' %}{{ euroval }} €{% endtrans %}
{{ _('Bitcoin client for I2P') }}:
-{% trans euroval='30.0', btcval='118.34' %}{{ euroval }} € and {{ btcval }} BTC{% endtrans %}
+{% trans btcval='50.34' %}{{ btcval }} BTC{% endtrans %}
{{ _('Unit Tests for I2P router') }}:
{% trans euroval='2305' %}{{ euroval }} €{% endtrans %}
-{{ _('Bounty Robert') }}: 0
-{{ _('Bounty Syndie') }}: 50 BTC
+{{ _('Bounty Robert') }}: 20
+{{ _('Bounty Syndie') }}: 18 BTC
+{{ _('Bounty I2P for CCR Microtic Board') }}: 10 €
{{ _('Current monthly running costs:') }}
@@ -86,7 +87,46 @@ with your name or nick (and optionally homepage) so we can list you here.
Feb, 2013 anonymous 0.01234567 BTC General fund
Feb, 2013 Change Syndie/IPv6 bounty 50 BTC 50 BTC Bounty Syndie,IPv6
+ Mar, 2013 Sell BTC 2598 € 100 BTC General fund
+ Mar, 2013 I2P Laptop 846,05 € General fund
+ Mar, 2013 Sell BTC 4123 € 100 BTC General fund
+ Mar, 2013 David Julian 30 € General fund
+ Mar, 2013 I2P Laptop 117,46 € General fund
+ Mar, 2013 anonymous 20 € General fund
+ Mar, 2013 anonymous 30 € General fund
+ Mar, 2013 Sell BTC 4998 € 100 BTC General fund
+ Mar, 2013 Sell BTC 5923 € 100 BTC General fund
+ Mar, 2013 i2p-projekt.net domain 11,90 € General fund
+ Mar, 2013 Sell BTC 7889 € 100 BTC General fund
+ Mar, 2013 anonymous 25 € General fund
+ Mar, 2013 anonymous 0.01234567 BTC General fund
+ Mar, 2013 echelon 10 BTC General fund
+ Mar, 2013 Recalc Syndie Bountie 32 BTC 32 BTC General fund, Syndie bounty
+
+ Apr, 2013 SSL cert syndie.de 389,70 € General fund
+ Apr, 2013 SSL cert geti2p.net 389,70 € General fund
+ Apr, 2013 anonymous 5 € General fund
+ Apr, 2013 giv 30 € General fund
+ Apr, 2013 anonymous 20 € General fund
+ Apr, 2013 anonymous 30 € General fund
+ Apr, 2013 Flattr 107,80 € General fund
+ Apr, 2013 SSL cert i2p2.de 2009,70 € General fund
+ Apr, 2013 anonymous 4 € General fund
+ Apr, 2013 anonymous 10 € General fund
+ Apr, 2013 anonymous 1 BTC General fund
+ Apr, 2013 29C3 contest 25 BTC General fund
+ Apr, 2013 29C3 contest 5 BTC General fund
+ Apr, 2013 29C3 contest 10,3 BTC General fund
+ Apr, 2013 anonymous 0.15 BTC General fund
+ Apr, 2013 anonymous 0.000024 BTC General fund
+ Apr, 2013 anonymous 0.0000496 BTC General fund
+ Apr, 2013 anonymous 0.01 BTC General fund
+ Apr, 2013 Bounty native I2P BTC client paid to giv 30 € Bounty BTC client
+ Apr, 2013 Bounty native I2P BTC client paid to giv 68 BTC Bounty BTC client
+ May, 2013 anonymous 50 € General fund
+ May, 2013 anonymous 0.3 BTC General fund
+ May, 2013 anonymous 10 € Bounty CCR Microtic Board
diff --git a/i2p2www/pages/site/docs/spec/common-structures.html b/i2p2www/pages/site/docs/spec/common-structures.html
index 7dacf0e6..21b93321 100644
--- a/i2p2www/pages/site/docs/spec/common-structures.html
+++ b/i2p2www/pages/site/docs/spec/common-structures.html
@@ -612,7 +612,10 @@ Cost is typically 5 or 6 for SSU, and 10 or 11 for NTCP.
{%- endtrans %}
- {% trans -%}
-Expiration is currently unused, always null (all zeroes))
+Expiration is currently unused, always null (all zeroes)).
+As of release 0.9.3, the expiration is assumed zero and not stored, so any non-zero expiration
+will fail in the RouterInfo signature verification.
+Implementing expiration (or another use for these bytes) will be a backwards-incompatible change.
{%- endtrans %}
diff --git a/i2p2www/pages/site/docs/spec/i2cp.html b/i2p2www/pages/site/docs/spec/i2cp.html
index 1afc055f..94fbd558 100644
--- a/i2p2www/pages/site/docs/spec/i2cp.html
+++ b/i2p2www/pages/site/docs/spec/i2cp.html
@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}I2CP Specification{% endblock %}
-{% block lastupdated %}December 2012{% endblock %}
-{% block accuratefor %}0.9.4{% endblock %}
+{% block lastupdated %}April 2013{% endblock %}
+{% block accuratefor %}0.9.5{% endblock %}
{% block content %}
I2P Control Protocol (I2CP) Specification
Overview
@@ -179,6 +179,7 @@ Actual message length limit is about 64 KB.
Uniquely identifies a message waiting on a particular router at a
point in time.
+This is always generated by the router and is NOT the same as the nonce generated by the client.
Contents
-
@@ -652,13 +653,13 @@ For an outgoing message, this is a response to a
-
Session ID
-
-Message ID
+Message ID generated by the router
-
1 byte Integer status
-
4 byte Integer size
-
-4 byte Integer nonce
+4 byte Integer nonce previously generated by the client
Notes
diff --git a/i2p2www/pages/site/docs/spec/i2np.html b/i2p2www/pages/site/docs/spec/i2np.html
index c0edb656..c621cc23 100644
--- a/i2p2www/pages/site/docs/spec/i2np.html
+++ b/i2p2www/pages/site/docs/spec/i2np.html
@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}I2NP Specification{% endblock %}
-{% block lastupdated %}September 2012{% endblock %}
-{% block accuratefor %}0.9.2{% endblock %}
+{% block lastupdated %}April 2013{% endblock %}
+{% block accuratefor %}0.9.5{% endblock %}
{% block content %}
I2P Network Protocol (I2NP) Specification
@@ -570,9 +570,13 @@ from:
flag:
1 byte
- valid values:
+ bit order: 76543210
+ bit 0:
0 FALSE => send reply directly
1 TRUE => send reply to some tunnel
+ bits 7-1:
+ Through release 0.9.5, must be set to 0
+ As of release 0.9.6, ignored, set to 0 for compatibility with future uses and with older routers
reply tunnelId:
4 byte Tunnel ID
diff --git a/i2p2www/pages/site/docs/transport/index.html b/i2p2www/pages/site/docs/transport/index.html
index 7ab5ad92..ab1b7b11 100644
--- a/i2p2www/pages/site/docs/transport/index.html
+++ b/i2p2www/pages/site/docs/transport/index.html
@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}Transport Overview{% endtrans %}{% endblock %}
-{% block lastupdated %}{% trans %}July 2010{% endtrans %}{% endblock %}
-{% block accuratefor %}0.8{% endblock %}
+{% block lastupdated %}{% trans %}April 2013{% endtrans %}{% endblock %}
+{% block accuratefor %}0.9.5{% endblock %}
{% block content %}
{% trans %}Transports in I2P{% endtrans %}
@@ -87,9 +87,18 @@ directly-accessible IP and ports.
{% trans %}Transport Selection{% endtrans %}
-{% trans i2np=site_url('docs/protocol/i2np') -%}
+
{% trans i2np=site_url('docs/protocol/i2np'),
+streaming=site_url('docs/api/streaming'),
+datagrams=site_url('docs/api/datagrams') -%}
The transport system delivers I2NP messages. The transport selected for any message is
-independent of the application-layer protocol (TCP or UDP).
+independent of the upper-layer protocols and contents (router or client messages, whether an external application was using
+TCP or UDP to connect to I2P, whether the upper layer was using
+the streaming library
+streaming
+or
+datagrams,
+datagrams
+etc.).
{%- endtrans %}
{% trans -%}
@@ -130,9 +139,10 @@ Additional transports may be developed, including:
- {% trans %}An "indirect" transport for routers that are not reachable by all other routers (one form of "restricted routes"){% endtrans %}
-{% trans -%}
-Also, the existing transports will be enhanced to support multiple addresses within a single transport,
+
{% trans thread='http://'+i2pconv('zzz.i2p')+'/topics/109' -%}
+IPv6: The existing transports must be enhanced to support multiple addresses within a single transport,
including IPV6 addresses. Currently, a transport may only advertise a single IPV4 address.
+See this thread for discussion.
{%- endtrans %}
{% trans -%}
diff --git a/i2p2www/pages/site/get-involved/bounties/index.html b/i2p2www/pages/site/get-involved/bounties/index.html
index 5abaf4da..0490b49a 100644
--- a/i2p2www/pages/site/get-involved/bounties/index.html
+++ b/i2p2www/pages/site/get-involved/bounties/index.html
@@ -1,7 +1,7 @@
{% extends "global/layout.html" %}
{% block title %}{{ _('Bounties') }}{% endblock %}
{% block content %}
-
+
{{ _('Bounties for I2P') }}
{% trans -%}
While we always gratefully accept any contributions of code,
@@ -82,7 +82,7 @@ etc), and the like.
{{ _('Proposal in development') }}
I2P team
[{{ _('vacant') }}]
- 50 BTC
+ 18 BTC
diff --git a/i2p2www/pages/site/get-involved/bounties/syndie-2012.html b/i2p2www/pages/site/get-involved/bounties/syndie-2012.html
index 076d702d..a280319c 100644
--- a/i2p2www/pages/site/get-involved/bounties/syndie-2012.html
+++ b/i2p2www/pages/site/get-involved/bounties/syndie-2012.html
@@ -3,7 +3,7 @@
{% block donatename %}{{ _('Syndie development') }}{% endblock %}
{% block bountydetails %}
-
+
{% trans -%}
Beside of I2P we want to encourage users
to care more about anonymity and security. As I2P is a low
@@ -12,7 +12,7 @@ can overcome some of these limits and provide better anonymity
for people who really need it.
{%- endtrans %}
{% trans -%}
-For our bad sake the syndie project is out of development for
+For our bad sake the syndie project was out of development for
quite a long time yet (5 years). To get a fresh and new built
with needed bugfixes we set out this bounty. Also syndie needs
some enhancements and a better GUI for users to work with it.
@@ -26,6 +26,26 @@ was created and made available on different webpages.
As a result of this work, the bounty sum was reduced and
the withdrawn money moved to the IPv6 bounty.
{%- endtrans %}
+
+Still a few jobs are left to be done, e.g. (taken from Lillith syndie post
+ urn:syndie:channel:d7:channel44:FRkKGjUxBPXAIG~j6uc4S7cEeQ6Eb0y44wEeuWxREYU=9:messageIdi1364502130641ee ):
+1. Port Syndie to AWT or another platform agnostic toolkit
+2. Fix most, if not all GUI bugs (this relates to the first point somewhat)
+3. Port Syndie to HSQLDB 2.0
+4. Be the maintainer for Syndie over a period of time (an amount per month or per quarter) and do the usual
+tasks like accepting and fixing minor bugs, promote Syndie in the wider world than just I2P, maintaining
+ good documentation
+5. Add some sort of 'File Archive' as a transport (for sneakernets)
+6. Add more transports from the introduction image to Syndie: Usenet, Gnutella, E-Mail, iMule, Tahoe-LAFS
+7. Get syndie into repos for major distros (at least, Debian, Fedora, Arch, Gentoo, FreeBSD ports, PkgSrc)
+8. Make the freenet archive work
+
+
+As these subtasks are of different difficulty and work, different amount of bounty are assigned to it:
+1. 5 BTC, 2. 2 BTC, 3. 2 BTC, 4. pure passion and appreciation by all the users, 5. 1 BTC, 6. 5 BTC, 7. 2 BTC and
+finally 8. 1 BTC.
+Sum: 18 BTC
+
{% endblock %}
{% block bountynotesouter %}{% endblock %}
diff --git a/i2p2www/pages/site/get-involved/develop/developers-keys.html b/i2p2www/pages/site/get-involved/develop/developers-keys.html
index cf8f0176..48d69fa4 100644
--- a/i2p2www/pages/site/get-involved/develop/developers-keys.html
+++ b/i2p2www/pages/site/get-involved/develop/developers-keys.html
@@ -228,6 +228,14 @@ lZGWQsF5G3ppvJ1Kwt/dUGi7gHbclKPnFAWXmb7YWOhl9Ua2USjQ4Y
rIeB7/2uVOpe+3FrFgUzIiWsx6I2yiNI3TscDvQsa5wG0Z2G4BbHXj
ONyiUzzO+j2TWPs3x35r2LCy8plRzPAswCF1GaIEjJCce5zwIDAQAB
[end]
+
+[pubkey zab2@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLabJXvbBfHZ4zH2
+kom+W2Kb3kYYs58j8ZygkK9rj8j2SrlokxLiLABVYK7tdlb1zgZJVY
+gO8flnqsOSGb2CtoQ3i3Fqk0HNq2if47LVyaLwgOyoPOhYkDDGr9Wg
+gBp+svAHALMoGvh0lemKQZpQfdMgZ33k2l2o3Udvj3tpB/KwIDAQAB
+[end]
+
{{ _('Developer Transport Keys') }}
{% trans monotone=site_url('get-involved/guides/monotone') -%}
@@ -389,6 +397,14 @@ I2CzDAkmI1ZJgEwZxGm3Dn/Jj7aNjXsJQeWDe4VSwVvtJdzwbrp3qm
GBapx3KtetESkPtq6BVL2j5qXP3rQ2QP4nOFh05DcuiO7D+uqHpLIb
tPXStQO9WfFgCzXRMvpCkX4OdnoRGgFkiIZHQJxT+ATLtNwQIDAQAB
[end]
+
+[pubkey zab2-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmh9ukHhxTY3/bDs
+At7mOUETxO3sLrf70kR9Mn4p44c4NKuFF4APmeYaFfIP9N5ZkBxY+5
+2YPCQNXdtLDAPpxrq9as+IOaxH3ZVENllml0iCuGjZWtvYVkxHXCKo
+hMMlffgZFJeDIEEed3eIttUPsIdW8U+2XQM1zF9R77+K0ZJQIDAQAB
+[end]
+
{% endblock %}
diff --git a/i2p2www/pages/site/get-involved/develop/license-agreements.html b/i2p2www/pages/site/get-involved/develop/license-agreements.html
index cbe9f4e5..30a27442 100644
--- a/i2p2www/pages/site/get-involved/develop/license-agreements.html
+++ b/i2p2www/pages/site/get-involved/develop/license-agreements.html
@@ -736,5 +736,38 @@ G58Br6HXTQLV8xAN1ml8
=4989
-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+I lost my original keys, will be using these going forward.
+
+Thanks,
+zab
+
+[pubkey zab2@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLabJXvbBfHZ4zH2kom+W2Kb3kYYs58j8ZygkK9rj8j2SrlokxLiLABVYK7tdlb1zgZJVYgO8flnqsOSGb2CtoQ3i3Fqk0HNq2if47LVyaLwgOyoPOhYkDDGr9WggBp+svAHALMoGvh0lemKQZpQfdMgZ33k2l2o3Udvj3tpB/KwIDAQAB
+[end]
+[pubkey zab2-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmh9ukHhxTY3/bDsAt7mOUETxO3sLrf70kR9Mn4p44c4NKuFF4APmeYaFfIP9N5ZkBxY+52YPCQNXdtLDAPpxrq9as+IOaxH3ZVENllml0iCuGjZWtvYVkxHXCKohMMlffgZFJeDIEEed3eIttUPsIdW8U+2XQM1zF9R77+K0ZJQIDAQAB
+[end]
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAEBAgAGBQJRdvPLAAoJEJkeLHPsdqhZvAgP/02btw3WcVZ1CSJkfSrZ/shE
+ooBPao/nq0XYY9GZdGbA2Ki/5HOKnPTyulPwCNocL3EULFzR9bCAr2ZdjujOdKOO
+6RQc6QcebGvtQF21eLdffT+LiHVI6Vl1y2ls288WP4YYhBXmaf7vj+6wNHf2l/B7
+wiFEZH2nfyml7fruyWa0GHmWla96rbdMfXMdJAIcu/Uv0E5AeUHhHYhrDAZFf1/0
+CzdW/MvXCtan0WwrNHfFmeDx29kT9wtF3cgduyBj/K4Kw1NDGpXt3w5Hybp0xak5
+mpCo+lAxpC6DgjaTvrF54Hnqe21dydUdfwTZ7dtzfPbEwK5LrAWJCpjnlYO3kote
+GUYXyGccg4A6nknCrkeidJcaF1j4xpJf38XY08z48r+Wd0/n5VSDbvo6BBcOljgp
+IC1YQMcnFdRcV/K7MNlm58+WTa6NqJgrqnMnHDwdwF2v4csH4hjVmOD5//u6pCNg
+ghCMrTVuEP6fqFJflFdKYfG/jlX7Vm1hh0a4QobWsII2A8TBGe9x3//ZXhX3d57c
+mFhMwzjnCWdUTAfGPKeT+YorOnL9YRwsoXyBm4LjKGuHAMOKYpbS+6aZV2plPgIe
+QUamNO18hBy7N/YdF2DPoV41ntobkM+kVfmR0jLCbiNjisMg1eO8mQ1ynY4Kf2F1
+6+WauW2gCAnDCnD/+EEh
+=7u31
+-----END PGP SIGNATURE-----
+
{% endblock %}
diff --git a/i2p2www/static/hosts.txt b/i2p2www/static/hosts.txt
index 4abde872..48ed41ab 100644
--- a/i2p2www/static/hosts.txt
+++ b/i2p2www/static/hosts.txt
@@ -343,4 +343,4 @@ push.git.repo.i2p=Mau9Jcsspec4cbDlrkt5zdxN-kq9SG9GxtvOQ6wBhgJKxRyEvZG4oqGs5N6oO6
irc.killyourtv.i2p=CnG0yQheyd67rl1nHuYZp1sVZxzXHe05UPrmT0B3Vxtd51K-Cq5E6v5~UTrU5lqj56ggvnRl0I8jg1vPn0Q50IH6ght~4ThkKlwDwTOMHmROz3sR6WLCOvD4ZFMDBYjBsxjF3383YSIlYrh~laTXSzD~lPhHLGD1jFQksqea-87sM-yfRzCbA7UyaHtURJ7A3GOb8Bm8W25mPOHpM~xT0TONvbi45IVmAeWkuZ5IhBsrzhWvY1-Riy6IW6KSRoQIZtr5o23cVHkjUh8J-~SWZR5wIgECefrVVCt556qDn35I2829Jlk26-iI9glMrr7funaOtp1wnDvNPTijlxwkeAx9GKPCX48nCyxIUeSTwGv0grDPn43V94tV0LSq8mkXZ1akDJUNf33z2Uao-nCi-ufb0Mt0rzgdRVW1i79GQHk4XbApzjYUjyaSY4cuR0yBRFHrOcrFt~XJABpt9DYklu6y3n54uOLZeXGnE5nKCSHLqyS3dxPTObIQvhz~ZjHRAAAA
www.syndie.i2p=DvyDrcY8se2M~qqp4qfZn-6UTFfS2Ieaye5QIhKoFQGktMbCK2MzhAMYvNm7n1k9O0hG86-nXPCP8rlFurPrCAKta~baUlCgbV4ft5zzu0Y4DFuhC6p-3V-03S5WF8JA5Pt4KEcKKEYiOkHzGVSKuWIjH11syZ434c0qarOFfynS1ZI2Ixlv2OXCEzs-r5NeMRy3tfwbLyPF46END1CyoWCNx-FUdOt5ueXVokYeJ00Pzqvhqb6ByqRh76N3Fz3GGIUjjSmSljDSN8B0K9943jKXCoH75YnC47cw~RwSD53pbLXiLWHqtIiqx8Zvq5LgIac9UVpIA9Ka27TWa5OhVhBKwuynPnfVaLv2xOR8dEDmVNnO8sNp4kP~MMTvJAUJfhAbPFbAs9i4Wx0IlLKN5gLnft-7Xd1pMivKZZaNWFicwr69VMub-ddl~vbhtueIvmkEdoLIw4xBb6nHmKy0gHi6TWjEmLXb8SsgDOkri7Nu9qRV8t6VF60wpjHPG33eAAAA
syndie-project.i2p=2~qacMy9FwwWCFm3JYRKSLIe8u6wEuinZPre0WoZC-M3IUSg8VhUp1QSPuaeFJdym69hjew6AOE-wnZ30mtzriXyvaYh7UNshTc9ZdEBWwhdn5cghMjf48HdBw3pKAiiw1gwv8WwsskbAxbSTkcQUmqGsterPyUqspSqddwUkcDxZHC7dUJsyyd4gcul40KljlIu9mMWXZLWQ7Zu8od~NcFNHVBE-UnTvDmHErpx7AWcN9VrD4j-OuVqsLYq1T9uhdLH-~H~9eE5RKekz6ehhGJRLlGB~2~MYVt4xrqbo4z18nFxdp9PorOO1wt5xiFSw4GEX5HAO2~pt97DVkcwogOEVCJbRbLiIJJDmehn5PB-56K4tjuUNFtzLAq7QQZEAAHGCUEaVPUObKS20vU~JN6GrAOAXKM2M-16frR0ddpJ4f55iuc~tVL3OFPAtha5aHP9xihP7i80rB5LsG0aT77Ey~mCWHrV2sQwhua40vP9TgpCi6Lg21DnVrR97S5tAAAA
-
+lists.i2p2.i2p=iKMDu6cP~nt4vubwZOuXWDQS4zdhF9x2YjhcilOrRIHR7lkP6ErNgUHZb~ggwnRaPkj81JpmbwDJ1GR~LLS7DcN5ktSZ1WhjVfrm92AQ4-yDX5HEcPpCnTPBp11zsrh2WEDXSjWMqyBPbkYMzrJ33ZGxVMxccXLlV~W9ecPrpl7EmrIF1gPmbinG1oDA0wFLaJyXPZrCRhdX6xMDgvb0slHE0pxAM00TeAQK~aL~LZ5iwfA7WllYd9jaDdQ-kjaa6qEKSSQHf~bNycR~OFsxKurh1CIbrglo8vIHss-tjIfKzG2mgO8w8AE01uhlsRTxjq7TYhxTWKn4kTFyaljJCE-SL1XTYwfyEEZ90bH8Puk1zDnKIARXMPA1YM26StySLLoFyQu2SbNfJcgCqYFcGStvaG54QFCLVnHOxTKi-Z3D-PBMc9aRKSHJilN1kzExGKNZSW09wX7btyEUCHXJjbep6oFauwrtGmP9SjjZf-o3BHzvQlaLSzVFKuPJ-5tQAAAA
diff --git a/i2p2www/static/images/ticket919/edit.png b/i2p2www/static/images/ticket919/edit.png
new file mode 100644
index 00000000..de50b56d
Binary files /dev/null and b/i2p2www/static/images/ticket919/edit.png differ
diff --git a/i2p2www/static/images/ticket919/home.png b/i2p2www/static/images/ticket919/home.png
new file mode 100644
index 00000000..42151086
Binary files /dev/null and b/i2p2www/static/images/ticket919/home.png differ
diff --git a/i2p2www/static/images/ticket919/i2p-services.png b/i2p2www/static/images/ticket919/i2p-services.png
new file mode 100644
index 00000000..f7465fef
Binary files /dev/null and b/i2p2www/static/images/ticket919/i2p-services.png differ
diff --git a/i2p2www/static/images/ticket919/paths.png b/i2p2www/static/images/ticket919/paths.png
new file mode 100644
index 00000000..73ecf283
Binary files /dev/null and b/i2p2www/static/images/ticket919/paths.png differ
diff --git a/netdb.i2p2/app.py b/netdb.i2p2/app.py
index 058c7479..7d43d3be 100644
--- a/netdb.i2p2/app.py
+++ b/netdb.i2p2/app.py
@@ -30,7 +30,7 @@ def app(environ, start_response):
if len(entries) > 150:
# select some randomly
new = []
- for i in range(100):
+ for i in range(50):
while True:
sel = choice(entries)
if not sel.startswith('routerInfo-'):
diff --git a/www.i2p2/pages/ticket919.html b/www.i2p2/pages/ticket919.html
new file mode 100644
index 00000000..d2fd34bc
--- /dev/null
+++ b/www.i2p2/pages/ticket919.html
@@ -0,0 +1,65 @@
+{% extends "_layout.html" %}
+{% block title %}Ticket 919/920 fix{% endblock %}
+{% block content %}
+
+
The issue described on this page only affects Windows systems that originally installed I2P
+with version 0.9.5. Other operating systems are not affected.
+
+This issue has been corrected as of the 0.9.5-win1 release.
+
+
+
+Background
+A change was introduced during the 0.9.5 cycle to allow I2P's configuration files to be edited with the standard
+ Windows text editor, Notepad
. This change had the unfortunate side-effect of causing our eepsite migration code to
+ fail to run on Windows systems, leading to eepsites being served from the installation directory. Consequently:
+
+
+ - depending upon how I2P is started, the eepsite may not be accessible; and
+ - confusion ensues—all documentation states that eepsites are served from the profile path; and
+ - the update to Jetty 7, included in the 0.9.6 release, will fail.
+
+While no action is required for users that are not hosting an eepsite (or are not using the included Jetty to host an eepsite), it is
+recommended to follow this procedure to avoid issues in case you decide to run a Jetty-hosted eepsite in the future. If you are running an
+eepsite it is important to follow this procedure prior to upgrading to 0.9.6.
+
+
+
+ Tickets 919 & 920 correspond to this issue.
+
+
+Fixing the configuration
+Because this issue causes the migration code to not run, the path in %APPDATA%\I2P\clients.config
isn't
+ updated to use an absolute path for the Jetty config file, requiring the path to be set manually. Experienced users
+ can set the correct path in clients.config
directly and restart I2P, but this page will explain how to
+ correct the problem from within the router console.
+
+
+
+ - From the Home page of the I2P Router Console, click the I2P logo in the upper-left corner.
+
+
+
+ - Click the I2P Services link.
+
+
+ You should see something like the following:
+
+
+ If the path at number 1 in the image above is set to eepsite/jetty.xml
, the path needs to be updated.
+
+ - Click the
Edit
button next to I2P webserver (eepsite). The page will reload to allow the path to be edited as shown below:
+
+
+ Insert the full path to your I2P configuration directory before the text "eepsite/jetty.xml" as shown above,
+ then click Click the Save Client Configuration
button.
+
+ - If you're hosting an eepsite, move its contents to its proper home at
%APPDATA%\I2P\eepsite\docroot
.
+
+ - At this point you should restart your I2P router.
+
+
+After following the steps outlined above, your eepsite will be served from %APPDATA%\I2P\eepsite\docroot
+ and should be accessible at http://127.0.0.1:7658.
+
+{% endblock %}
diff --git a/www.i2p2/pages/translations/bounties_de.html b/www.i2p2/pages/translations/bounties_de.html
index df5b2d0b..ee179c25 100644
--- a/www.i2p2/pages/translations/bounties_de.html
+++ b/www.i2p2/pages/translations/bounties_de.html
@@ -1,7 +1,7 @@
{% extends "_layout_de.html" %}
{% block title %}Belohnungen{% endblock %}
{% block content %}
-
+
Belohnungen für I2P
Während wir jederzeit dankbar jeglichen Beitrag an Quelltext,
Dokumentationen und ähnlichen entgegennehmen, gibt es noch
@@ -81,7 +81,7 @@ etc.) benutzt wird.
Entwickler gesucht
I2P team
[vacant]
- 50 BTC
+ 18 BTC
diff --git a/www.i2p2/pages/translations/bounty_syndie2012_de.html b/www.i2p2/pages/translations/bounty_syndie2012_de.html
index 6db59a58..dc9cac2f 100644
--- a/www.i2p2/pages/translations/bounty_syndie2012_de.html
+++ b/www.i2p2/pages/translations/bounty_syndie2012_de.html
@@ -12,12 +12,8 @@ von Syndie bietet es eine bessere Sicherheit und Anonymit$auml;t
für Leute, die dieses benötigen.
Leider wurde die Software seit 5 Jahren nicht mehr aktiv
-weiter entwickelt und gepflegt. Um diesen Mißstand zu
-beheben und eine aktuelle Version von Syndie anbieten zu
-können setzt das I2P Team eine Belohnung von 50 Bitcoin
-für die Weiterentwicklung von Syndie aus. Ebenso braucht
-Syndie weitere Verbesserungen und eine bessere Benutzerschnittstelle.
-
+weiter entwickelt und gepflegt.
+
Die letzte Coding Ralley brachte erhebliche Verbesserungen der
derzeitigen Situation. Ein neues Syndie Paket mit Bugfixes wurde
@@ -25,7 +21,30 @@ erstellt und auf diversen Webseiten Online gestellt.
Somit wurde die Belohnung reduziert und die entnommene Summe
der IPv6 Belohnung zugeschlagen.
-
+
+Diese Belohnung wurde hinzu in diverse kleinere Sub-Aufgaben geteilt mit
+verschiedenen Belohnungen. Da der Coder englisch beherrschen sollte ist
+die Liste an Aufgaben und deren Belohnung hier nicht übersetzt.
+
+
+Still a few jobs are left to be done, e.g. (taken from Lillith syndie post
+ urn:syndie:channel:d7:channel44:FRkKGjUxBPXAIG~j6uc4S7cEeQ6Eb0y44wEeuWxREYU=9:messageIdi1364502130641ee ):
+1. Port Syndie to AWT or another platform agnostic toolkit
+2. Fix most, if not all GUI bugs (this relates to the first point somewhat)
+3. Port Syndie to HSQLDB 2.0
+4. Be the maintainer for Syndie over a period of time (an amount per month or per quarter) and do the usual
+tasks like accepting and fixing minor bugs, promote Syndie in the wider world than just I2P, maintaining
+ good documentation
+5. Add some sort of 'File Archive' as a transport (for sneakernets)
+6. Add more transports from the introduction image to Syndie: Usenet, Gnutella, E-Mail, iMule, Tahoe-LAFS
+7. Get syndie into repos for major distros (at least, Debian, Fedora, Arch, Gentoo, FreeBSD ports, PkgSrc)
+8. Make the freenet archive work
+
+
+As these subtasks are of different difficulty and work, different amount of bounty are assigned to it:
+1. 5 BTC, 2. 2 BTC, 3. 2 BTC, 4. pure passion and appreciation by all the users, 5. 1 BTC, 6. 5 BTC, 7. 2 BTC and
+finally 8. 1 BTC.
+Sum: 18 BTC
Hinweis:
diff --git a/www.i2p2/pages/translations/debian_fr.html b/www.i2p2/pages/translations/debian_fr.html
index bc7c0897..f38181c2 100644
--- a/www.i2p2/pages/translations/debian_fr.html
+++ b/www.i2p2/pages/translations/debian_fr.html
@@ -6,14 +6,10 @@
The paquets hébergés sur le site Launchpad I2P
ont été testés et devraient fonctionner sur x86/x86_64 avec
- - Ubuntu (Hardy 8.04 et ultérieures)
- - Mint 11
- - Debian Linux (Lenny et ultérieures) & kFreeBSD (Wheezy)
+ - Ubuntu (Precise12.04 et ultérieures)
+ - Mint
+ - Debian Linux (Wheezy et ultérieures) & kFreeBSD
- Knoppix
- - Simply MEPIS 8.5.03-rel1
- - Trisquel 4.5.1
- - gNewSense 2.3
- - Nexenta 3.0.1
Les paquets I2P peuvent marcher sur des systèmes non listés ci-dessus.
Merci de rapporter tout problème avec ces paquets dans Trac sur
@@ -25,7 +21,7 @@ Merci de rapporter tout problème avec ces paquets dans Non-Linux (et peut-être les architectures non x-86)
-Instructions pour Ubuntu Lucid Lynx (et plus récentes) et ses dérivées comme Linux Mint & Trisquel
+Instructions pour Ubuntu Precise Pangolin (et plus récentes) et ses dérivées comme Linux Mint & Trisquel
Ajout du PPA via la ligne de commande et installation d'I2P
- Ouvrez un terminal et entrez:
@@ -41,7 +37,7 @@ ajoutée par la commande précédente.
Ajout de la PPA et installation avec Synaptic
-- Ouvrez Synaptic (Système -> Administration -> Gestionnaire de paquets Synaptic).
+- Ouvrez Synaptic (Système -> Administration -> Gestionnaire de paquets Synaptic).
- Une fois Synaptic lancé, sélectionnez Dépôts dans le menu
Configuration.
- Cliquez sur l'onglet Autres logiciels et cliquez sur le bouton
@@ -63,13 +59,13 @@ cliquez sur Ajouter à la sélection pui
À la fin du processus d'installation vous pouvez passer à l'étape suivante pour
démarrer I2P et le configurer pour votre système.
-Instructions pour Debian Lenny et plus récentes
+Instructions pour Debian Wheezy et plus récentes
Les étapes suivantes doivent être effectuées avec l'accès root (c.à d. en basculant de l'utilisateur en cours à root
avec "su" ou en préfixant chaque commande avec "sudo").
- Ajoutez les entrées suivantes à
/etc/apt/sources.list.d/i2p.list
- deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main
- deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu natty main
+ deb http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main
+ deb-src http://ppa.launchpad.net/i2p-maintainers/i2p/ubuntu raring main
Ces deux lignes devraient fonctionner quelle que soit la version de Debian installée.
- Ajouter la clé GPG de signature du dépôt avec la commande suivante:
diff --git a/www.i2p2/pages/translations/download_ar.html b/www.i2p2/pages/translations/download_ar.html
index deace1f4..cd528cea 100644
--- a/www.i2p2/pages/translations/download_ar.html
+++ b/www.i2p2/pages/translations/download_ar.html
@@ -14,10 +14,10 @@
التثبيت لأول مرة
- Windows التثبيت عن طريق الواجهة الرسومية :
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
- Linux / BSD / Solaris التثبيت عن طريق الواجهة الرسومية :
diff --git a/www.i2p2/pages/translations/download_cs.html b/www.i2p2/pages/translations/download_cs.html
index adb11334..eb41ceba 100644
--- a/www.i2p2/pages/translations/download_cs.html
+++ b/www.i2p2/pages/translations/download_cs.html
@@ -10,10 +10,10 @@ nebo z příkazové řádky pomocí příkazu java -version
Nová instalace
- Windows Grafický instalační program:
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
Pod Windows: stáhněte soubor a spusťte ho.
diff --git a/www.i2p2/pages/translations/download_de.html b/www.i2p2/pages/translations/download_de.html
index d64dcf2b..5dce9aa1 100644
--- a/www.i2p2/pages/translations/download_de.html
+++ b/www.i2p2/pages/translations/download_de.html
@@ -14,10 +14,10 @@ oder gebe java -version in die Kommandozeile ein.
Frische Installation
- Windows GUI Installer:
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
Downloade die Datei und führe sie aus.
- Linux / BSD / Solaris GUI Installer:
diff --git a/www.i2p2/pages/translations/download_el.html b/www.i2p2/pages/translations/download_el.html
index 56779b3f..29267313 100644
--- a/www.i2p2/pages/translations/download_el.html
+++ b/www.i2p2/pages/translations/download_el.html
@@ -14,10 +14,10 @@ Java Runtime 1.5 ή νεότερο.
Εγκατάσταση
- Εγκατάσταση με γραφικό περιβάλλον για Windows:
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
Κατεβάστε αυτό το αρχείο και εκτελέστε το.
diff --git a/www.i2p2/pages/translations/download_es.html b/www.i2p2/pages/translations/download_es.html
index 72e7b945..8dfc6f29 100644
--- a/www.i2p2/pages/translations/download_es.html
+++ b/www.i2p2/pages/translations/download_es.html
@@ -14,10 +14,10 @@ o teclea java -version en tu línea de comandos.
Instalaciones limpias
- Windows Instalador gráfico:
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
- Linux / BSD / Solaris Instalador gráfico:
diff --git a/www.i2p2/pages/translations/download_fr.html b/www.i2p2/pages/translations/download_fr.html
index 463484b5..0bbe1267 100644
--- a/www.i2p2/pages/translations/download_fr.html
+++ b/www.i2p2/pages/translations/download_fr.html
@@ -15,9 +15,9 @@ ou tapez java -version à l'invite de commande.
Installation initiale
- Windows Installeur graphique:
- i2pinstall_0.9.5_windows.exe
- (SHA256 d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+ i2pinstall_0.9.5-win1_windows.exe
+ (SHA256 d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
Téléchargez ce fichier et exécutez-le.
diff --git a/www.i2p2/pages/translations/download_ru.html b/www.i2p2/pages/translations/download_ru.html
index 67dd6b48..e241bd72 100644
--- a/www.i2p2/pages/translations/download_ru.html
+++ b/www.i2p2/pages/translations/download_ru.html
@@ -15,10 +15,10 @@
- Графический инсталлятор для Windows:
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
Под Windows: скачайте этот файл и запустите его.
diff --git a/www.i2p2/pages/translations/download_zh.html b/www.i2p2/pages/translations/download_zh.html
index 65c7a4ce..c591333b 100644
--- a/www.i2p2/pages/translations/download_zh.html
+++ b/www.i2p2/pages/translations/download_zh.html
@@ -11,10 +11,10 @@
全新安装
- Windows 图形安装程序:
- i2pinstall_0.9.5_windows.exe
+ i2pinstall_0.9.5-win1_windows.exe
(SHA256
-d904878f1feb758afb75cae31af52e3504b43b5ff531c060d902145a19eec56e
- sig)
+d64101793764bf77ac3dfc2352677b3d06eef3b6ecb4fa0cf2cf43fc237302f8
+ sig)
- Linux / BSD / Solaris 图形安装程序:
diff --git a/www.i2p2/pages/translations/halloffame_de.html b/www.i2p2/pages/translations/halloffame_de.html
index fd1c4a96..a3a1e03f 100644
--- a/www.i2p2/pages/translations/halloffame_de.html
+++ b/www.i2p2/pages/translations/halloffame_de.html
@@ -1,18 +1,19 @@
{% extends "_layout_de.html" %}
{% block title %}Ruhmeshalle{% endblock %}
{% block content %}
-
+
I2P's Ruhmeshalle
-Derzeitiger Stand zum 01.03.2013:
-Generelles Konto: 5940,28 € und 1222,87398130 BTC
+Derzeitiger Stand zum 01.05.2013:
+Generelles Konto: 28078,57 € und 626,04640057 BTC
Datencontainer Belohnung: 145.0 € und 2 BTC
native IPv6-I2P : 100.0 € und 50 BTC
I2PHex Code Belohnung: 100.0 €
I2P in Debian Spiegelserver: 123.0 €
-Bitcoin Client für I2P: 30.0 € und 118,34 BTC
+Bitcoin Client für I2P: 50,34 BTC
Unit Tests für den I2P Router: 2305 €
-Bounty Robert: 0
-Bounty Syndie: 50 BTC
+Bounty Robert: 20
+Bounty Syndie: 18 BTC
+Bounty I2P auf CCR Microtic Board: 10 €
Derzeitige laufenden monatliche Kosten:
@@ -78,7 +79,46 @@ hinzufügen können.
Feb, 2013 anonymous 0.01234567 BTC Generelles Konto
Feb, 2013 Syndie/IPv6 Bounty Wechsel 50 BTC 50 BTC Belohnung Syndie,IPv6
+ Mar, 2013 Verkauf BTC 2598 € 100 BTC Generelles Konto
+ Mar, 2013 I2P Laptop 846,05 € Generelles Konto
+ Mar, 2013 Verkauf BTC 4123 € 100 BTC Generelles Konto
+ Mar, 2013 David Julian 30 € Generelles Konto
+ Mar, 2013 I2P Laptop 117,46 € Generelles Konto
+ Mar, 2013 anonymous 20 € Generelles Konto
+ Mar, 2013 anonymous 30 € Generelles Konto
+ Mar, 2013 Verkauf BTC 4998 € 100 BTC Generelles Konto
+ Mar, 2013 Verkauf BTC 5923 € 100 BTC Generelles Konto
+ Mar, 2013 i2p-projekt.net Domain 11,90 € Generelles Konto
+ Mar, 2013 Verkauf BTC 7889 € 100 BTC Generelles Konto
+ Mar, 2013 anonymous 25 € Generelles Konto
+ Mar, 2013 anonymous 0.01234567 BTC Generelles Konto
+ Mar, 2013 echelon 10 BTC Generelles Konto
+ Mar, 2013 Umbau Syndie Bountie 32 BTC 32 BTC Generelles Konto, Syndie Belohnung
+
+ Apr, 2013 SSL cert syndie.de 389,70 € Generelles Konto
+ Apr, 2013 SSL cert geti2p.net 389,70 € Generelles Konto
+ Apr, 2013 anonymous 5 € Generelles Konto
+ Apr, 2013 giv 30 € Generelles Konto
+ Apr, 2013 anonymous 20 € Generelles Konto
+ Apr, 2013 anonymous 30 € Generelles Konto
+ Apr, 2013 Flattr 107,80 € Generelles Konto
+ Apr, 2013 SSL cert i2p2.de 2009,70 € Generelles Konto
+ Apr, 2013 anonymous 4 € Generelles Konto
+ Apr, 2013 anonymous 10 € Generelles Konto
+ Apr, 2013 anonymous 1 BTC Generelles Konto
+ Apr, 2013 29C3 contest 25 BTC Generelles Konto
+ Apr, 2013 29C3 contest 5 BTC Generelles Konto
+ Apr, 2013 29C3 contest 10,3 BTC Generelles Konto
+ Apr, 2013 anonymous 0.15 BTC Generelles Konto
+ Apr, 2013 anonymous 0.000024 BTC Generelles Konto
+ Apr, 2013 anonymous 0.0000496 BTC Generelles Konto
+ Apr, 2013 anonymous 0.01 BTC Generelles Konto
+ Apr, 2013 Belohnung I2P BTC Klient von User giv 30 € Belohnung BTC Klient
+ Apr, 2013 Belohnung I2P BTC Klient von User giv 68 BTC Belohnung BTC Klient
+ May, 2013 anonymous 50 € Generelles Konto
+ May, 2013 anonymous 0.3 BTC Generelles Konto
+ May, 2013 anonymous 10 € Belohnung CCR Microtic Board
diff --git a/www.i2p2/pages/translations/license-agreements_de.html b/www.i2p2/pages/translations/license-agreements_de.html
index 7a5c7c99..64f2b32d 100644
--- a/www.i2p2/pages/translations/license-agreements_de.html
+++ b/www.i2p2/pages/translations/license-agreements_de.html
@@ -720,6 +720,38 @@ G58Br6HXTQLV8xAN1ml8
=4989
-----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+I lost my original keys, will be using these going forward.
+
+Thanks,
+zab
+
+[pubkey zab2@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDLabJXvbBfHZ4zH2kom+W2Kb3kYYs58j8ZygkK9rj8j2SrlokxLiLABVYK7tdlb1zgZJVYgO8flnqsOSGb2CtoQ3i3Fqk0HNq2if47LVyaLwgOyoPOhYkDDGr9WggBp+svAHALMoGvh0lemKQZpQfdMgZ33k2l2o3Udvj3tpB/KwIDAQAB
+[end]
+[pubkey zab2-transport@mail.i2p]
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDmh9ukHhxTY3/bDsAt7mOUETxO3sLrf70kR9Mn4p44c4NKuFF4APmeYaFfIP9N5ZkBxY+52YPCQNXdtLDAPpxrq9as+IOaxH3ZVENllml0iCuGjZWtvYVkxHXCKohMMlffgZFJeDIEEed3eIttUPsIdW8U+2XQM1zF9R77+K0ZJQIDAQAB
+[end]
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAEBAgAGBQJRdvPLAAoJEJkeLHPsdqhZvAgP/02btw3WcVZ1CSJkfSrZ/shE
+ooBPao/nq0XYY9GZdGbA2Ki/5HOKnPTyulPwCNocL3EULFzR9bCAr2ZdjujOdKOO
+6RQc6QcebGvtQF21eLdffT+LiHVI6Vl1y2ls288WP4YYhBXmaf7vj+6wNHf2l/B7
+wiFEZH2nfyml7fruyWa0GHmWla96rbdMfXMdJAIcu/Uv0E5AeUHhHYhrDAZFf1/0
+CzdW/MvXCtan0WwrNHfFmeDx29kT9wtF3cgduyBj/K4Kw1NDGpXt3w5Hybp0xak5
+mpCo+lAxpC6DgjaTvrF54Hnqe21dydUdfwTZ7dtzfPbEwK5LrAWJCpjnlYO3kote
+GUYXyGccg4A6nknCrkeidJcaF1j4xpJf38XY08z48r+Wd0/n5VSDbvo6BBcOljgp
+IC1YQMcnFdRcV/K7MNlm58+WTa6NqJgrqnMnHDwdwF2v4csH4hjVmOD5//u6pCNg
+ghCMrTVuEP6fqFJflFdKYfG/jlX7Vm1hh0a4QobWsII2A8TBGe9x3//ZXhX3d57c
+mFhMwzjnCWdUTAfGPKeT+YorOnL9YRwsoXyBm4LjKGuHAMOKYpbS+6aZV2plPgIe
+QUamNO18hBy7N/YdF2DPoV41ntobkM+kVfmR0jLCbiNjisMg1eO8mQ1ynY4Kf2F1
+6+WauW2gCAnDCnD/+EEh
+=7u31
+-----END PGP SIGNATURE-----
{% endblock %}