propagate from branch 'i2p.www' (head 46fe9b025e5b7bd010b409c8aa0695f59f9dd6b5)

to branch 'i2p.www.str4d' (head 1f4d489b787e1049975ee408ceb4b22a940c2972)

i2p2www/__init__.py

@@ -22,7 +22,7 @@ except ImportError:
 ###########
 # Constants
 
-CURRENT_I2P_VERSION = '0.9.24'
+CURRENT_I2P_VERSION = '0.9.25'
 
 CANONICAL_DOMAIN = 'geti2p.net'
 

i2p2www/blog/2016/03/22/0.9.25-Release.rst

@@ -0,0 +1,84 @@
+{% trans -%}
+==============
+0.9.25 Release
+==============
+{%- endtrans %}
+.. meta::
+   :author: zzz
+   :date: 2016-03-22
+   :category: release
+   :excerpt: {% trans %}0.9.25 contains SAM 3.3, QR codes, and bug fixes{% endtrans %}
+
+{% trans -%}
+Update details
+==============
+{%- endtrans %}
+
+{% trans -%}
+0.9.25 contains a major new version of SAM, v3.3, to support sophisticated multiprotocol applications.
+It adds QR codes for sharing hidden service addresses with others,
+and "identicon" images for visually distinguishing addresses.
+{%- endtrans %}
+
+{% trans -%}
+We've added a new "router family" configuration page in the console,
+to make it easier to declare that your group of routers is run by a single person.
+There are several changes to increase the capacity of the network and hopefully improve tunnel build success.
+{%- endtrans %}
+
+{% trans -%}
+As usual, we recommend that you update to this release. The best way to
+maintain security and help the network is to run the latest release.
+{%- endtrans %}
+
+
+**{% trans %}RELEASE DETAILS{% endtrans %}**
+
+**{% trans %}Changes{% endtrans %}**
+
+- {% trans %}Display of identicons and QR codes in address book and i2ptunnel{% endtrans %}
+- {% trans %}SAM v3.3 with advanced features{% endtrans %}
+- {% trans %}Configuration page for router family{% endtrans %}
+- {% trans %}Custom icons for plugins{% endtrans %}
+- {% trans %}Internal implementation of self-signed certificate generation{% endtrans %}
+- {% trans %}Add i2ptunnel http server options to block by referer or user-agent{% endtrans %}
+
+
+**{% trans %}Bug Fixes{% endtrans %}**
+
+- {% trans %}IRC server tunnel default fix to help reliability{% endtrans %}
+- {% trans %}Don't wait until a lease expires to switch to a new on{% endtrans %}e
+
+
+**{% trans %}Other{% endtrans %}**
+
+- {% trans %}Preliminary support for certificate revocations{% endtrans %}
+- {% trans %}Preliminary support for storing EdDSA and ElGamal keys in keystores{% endtrans %}
+- {% trans %}More efficient signing and verification with EdDSA{% endtrans %}
+- {% trans %}Increase default connection limits{% endtrans %}
+- {% trans %}Increase default inbound bandwidth{% endtrans %}
+- {% trans %}Increase max files per torrent in i2psnark{% endtrans %}
+- {% trans %}Add more sanity checks to detect bad system clock{% endtrans %}
+- {% trans %}Improve news styling in console{% endtrans %}
+- {% trans %}Improve certificate blacklist implementation{% endtrans %}
+- {% trans %}Faster disconnect after publishing router info to floodfill{% endtrans %}
+- {% trans %}Smooth out the dropping of idle SSU sessions{% endtrans %}
+- {% trans %}Add X-Content-Type-Options headers in console{% endtrans %}
+- {% trans %}Translation updates{% endtrans %}
+- {% trans %}Update GeoIP data (new installs and PPA only){% endtrans %}
+
+
+`Full list of fixed bugs`_
+
+.. _{% trans %}`Full list of fixed bugs`{% endtrans %}: http://trac.i2p2.de/query?resolution=fixed&milestone=0.9.25
+
+
+**{% trans %}SHA256 Checksums:{% endtrans %}**
+
+::
+
+      094945d8728ca50195345b52c8154b2fdfa65b6af36adfcdb1fa2169f7401ebf  i2pinstall_0.9.25_windows.exe
+      47c9d361940fc429effd57cc6718d72fde7a66663d5dfbb18fa30aba569b69fc  i2pinstall_0.9.25.jar
+      daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236  i2psource_0.9.25.tar.bz2
+      5245609257f80ab2177adc50593db239cc6e24bd9e39378c650a34e031451c01  i2pupdate_0.9.25.zip
+      1305a98770234a2223465f9806eca47b327b43fea43d2195eab8ef54ab363149  i2pupdate.su3

i2p2www/meetings/logs/246.log

@@ -0,0 +1,132 @@
+20:00:01 <zzz> 0) Hi
+20:00:01 <zzz> 1) 0.9.27-29 roadmap: http://i2p-projekt.i2p/en/get-involved/roadmap
+20:00:05 <zzz> 0) Hi
+20:00:07 <zzz> hi
+20:00:35 <zzz> 1) 0.9.27-29 roadmap: http://i2p-projekt.i2p/en/get-involved/roadmap
+20:00:57 <str4d> hi
+20:01:17 <z3r0fox> hi
+20:01:17 <zzz> my goal today is to split up the 27-29 roadmap into 27 and 28-29, at a minimum
+20:02:05 <zzz> keeping in mind my two long-term goals: 1) grow the network; 2) improve security
+20:02:55 <zzz> so let's look at the 27-29 list. Anything jump out as being high-priority that we need to have in 27, or at least start working on?
+20:05:08 <str4d> "Crypto migration for existing hidden services" <-- I assume this is adding the backend and UI bits to enable people to do the migration?
+20:05:13 <str4d> (as well as doing so on stats.i2p etc.)
+20:05:49 <str4d> "Initial work on new crypto" <-- This rates very highly for me, but implementation is still blocking on design work
+20:05:51 <zzz> yeah, building off the subscription feed work in 26
+20:06:21 <zzz> we could call it 'initial design work'
+20:06:34 <str4d> Mmm
+20:06:41 <str4d> Let's figure out the actual dependency graph here
+20:06:53 <str4d> (for the other first few items)
+20:07:11 <str4d> a - Initial work on NTCP2
+20:07:24 <str4d> b - Initial work on New DH
+20:07:29 <str4d> c - Initial work on new crypto
+20:07:29 <str4d> d - Initial work on LS2 with multi-destination support
+20:07:33 <str4d> e - Initial work on new netdb ("next backend")
+20:08:23 <zzz> anything labeled 'initial work' probably doesn't have dependencies
+20:08:23 <str4d> LS2 requires new netDB code to support, no?
+20:08:46 <str4d> Well yes, if it is internal support for the router parsing bits of it
+20:09:23 <str4d> But how the router gets that data to parse will have dependencies
+20:09:39 <zzz> 'new netdb' is the tuna stuff like R5N, so it's orthogonal to LS2
+20:09:51 * str4d is trying to separate the things we can implement sooner from the things we need to focus design work on that may be blocking other tasks
+20:09:54 <str4d> Okay
+20:10:34 <str4d> c depends on d, at least
+20:10:52 <str4d> because at the e2e layer, the crypto is in the LS
+20:11:08 <str4d> What do you mean by b?
+20:11:27 <str4d> (because b would appear to be a prerequisite for a otherwise)
+20:12:08 <zzz> b = make a list of DH candidates, with info on code availability, speed, etc
+20:13:04 <str4d> Okay, then b *is* semi-independent of a :)
+20:13:04 <zzz> c = make a plan, make a list
+20:13:51 <zzz> a lot of this 'initial work' stuff is pretty much dead on the vine. Nobody's thought about it in months or years, no recent discussion
+20:14:04 <zzz> somebody's got to get their head back into it
+20:14:07 <str4d> Ah, I see my mistake. I assumed that everything on the list was referring to things actually landing as code
+20:15:41 <zzz> maybe, maybe not
+20:15:52 <str4d> Okay, my priorities now are all of them at once ;D
+20:16:25 <str4d> But probably starting with something that will have a shorter turnaround
+20:16:30 <zzz> a lot of it requires consensus building and design with i2pd and kovri before coding
+20:17:02 <str4d> Mmm
+20:18:34 <str4d> What needs to happen IMHO for a and d is a small group of people reviewing all the existing proposals and getting some clarity, then having some kind of design discussion meeting
+20:18:48 <str4d> With as little meeting as possible ideally :P
+20:19:28 <str4d> b will have some impact on a from a design perspective, but can be delayed
+20:20:14 <zzz> I'd be happy with revitalizing the discussions on zzz.i2p for starters. We have 20-30 proposals up now, most have landed with a thud or are forgotten.
+20:20:37 <str4d> Likewise with c on d
+20:20:37 <str4d> Of those five though, e will probably have the most effect on network reliability...
+20:20:40 <zzz> As a result we are very poorly positioned for future development atm
+20:21:39 <str4d> At this point we're putting aside tunnel-level crypto, which I have no problem doing (we want to wait a bit and see what comes out of the Tor work here)
+20:21:47 <zzz> which is another reason why summer of x could be a better place to put resources. At least what needs to be done for all the x's is more clear
+20:22:21 <zzz> is 'tunnel-level crypto' even on a list or post at all?
+20:22:41 <str4d> IDK
+20:22:53 <str4d> This is something we will figure out better once I get the proposals on the website :P
+20:23:40 * str4d will be working on the precursor to that today.
+20:23:51 <zzz> I would ask you what you'd most want to work on, but that seems silly given that you have months and months of past-due things on your list atm
+20:24:43 <str4d> Well, a lot of that was just overly ambitious and unrealistic todo scheduling on my part
+20:25:21 <str4d> (not taking into account the actual work required, like e.g. the Android release...)
+20:25:55 <zzz> I'm pretty pessimistic about progress right now, even for .26, which I haven't started yet and could take quite a while
+20:26:03 <str4d> For 0.9.26 we already have a list of things that need implementing. But we can also get started on design discussions.
+20:26:16 <zzz> And I may have to take several weeks off of coding to figure out launchpad and debian
+20:26:30 <str4d> Hmm, yeah..
+20:27:04 <zzz> so at this point 27 feels a long way off
+20:27:21 <str4d> Okay, let's say we can only do one of [ transport encryption | e2e encryption ]
+20:27:33 <str4d> (in terms of doing design planning alongside other implementation stuff)
+20:27:41 <str4d> Which is more important to get finished?
+20:28:26 <str4d> Transport encryption is important wrt third-party adversaries
+20:28:56 <str4d> E2E encryption is important wrt OBEPs and IBGWs who see that encrypted packet, and also to tunnel performance
+20:29:09 <zzz> I'm leaning toward transport stuff DH/NTCP2/padding/PT. It's less blue-sky and we have more sketched out already. THe path is more clear
+20:30:29 <str4d> Then let's focus on that for .27
+20:31:52 <zzz> you think that's more impt than LS2? LS2 is in a similar state as transport stuff. Lots of proposals, zero recent discussion
+20:32:28 <str4d> Ideally I'd like to work on them both in parallel
+20:32:41 <str4d> But I'm trying to be realistic here about what we will actually achieve :)
+20:32:47 <zzz> gun to head, pick one
+20:33:30 <str4d> transport
+20:33:39 <zzz> ok, agreed
+20:33:46 <psi> tls lookalike transport when?
+20:34:08 <str4d> Transport stuff is beneficial to the anonymity properties we provide our *current* users
+20:34:21 <str4d> LS2 stuff is beneficial to *future* users (as well as current)
+20:34:26 <zzz> not on any list or proposal iirc psi
+20:34:34 <str4d> Also I have many more questions in my head re: LS2 than transport
+20:34:47 <psi> kk
+20:35:12 <zzz> str4d, if you could get those q's into the zzz.i2p threads that would be a start
+20:35:19 <str4d> zzz, not sure that's true, I know at the very least it is on the Trac wiki
+20:36:19 <zzz> basically there's about 20 proposals on zzz.i2p dying for participation from str4d, psi, orignal, anonimal. If we move a couple to the top of the list as we just did today, hopefully they will get more eyeballs
+20:36:19 <str4d> Might be more apt to say "question marks"
+20:36:36 <str4d> mmm
+20:36:38 <zzz> sure, some of the LS2 stuff is pretty throw-it-at-the-wall
+20:37:01 <str4d> So in my mind, my #1 todo task right now is getting the proposals onto the website
+20:37:31 <zzz> in my mind, android is #1 for you
+20:37:42 <str4d> (and my other #1 todo task is fixing the ProGuard bug in I2P Android)
+20:37:50 <str4d> Yah
+20:38:08 <orignal> I'm fine with any proposal as soon as they get moved forward
+20:38:08 <str4d> Worst-case, I just back out the Samsung 4.2 fix for this release
+20:38:09 <zzz> so for 27, the list is transport stuff: progress on DH, NTCP, and PT
+20:38:21 <zzz> anything else for 27?
+20:38:39 <str4d> Mmm. Put LS2 design work into .28
+20:39:17 <str4d> zzz, initial console design planning would be nice
+20:39:45 <orignal> I personally can't wait for a new crypto, especially for destinations, so LS2 should be implemented asap
+20:40:08 <str4d> (inasmuch as deciding on a direction and roadmap, no actual implementing)
+20:40:08 <zzz> ok
+20:41:18 <zzz> I think that's a pretty ambitious 27: crypto migration for existing hidden svcs + the transport stuff
+20:41:20 <str4d> orignal, likewise; hence I want to make sure we get it right :)
+20:41:43 <zzz> I'll put LS2 and related stuff in 28 and move everything else to 29?
+20:42:35 <str4d> Sounds reasonable
+20:42:35 <str4d> .27 then has a good mix of design and implementation
+20:42:38 <zzz> anything else on 1) roadmap ?
+20:43:18 <str4d> Not from me at this time.
+20:43:27 <zzz> any other topics?
+20:43:34 <str4d> We want to revisit this of course, probably part-way through .26
+20:44:08 <str4d> (to ensure we are on-track with the necessary prep for .27)
+20:44:50 <str4d> 2) How are we doing re: kytv disappearance recovery?
+20:44:55 <zzz> Next monthly meeting is April 5. I want to say in advance that if nobody reports that they've done anything since the March 3 meeting, I'm going to declare this new project management style a failure. If nobody's doing anything, there's nothing to manage and no need to have monthly meetings
+20:45:33 <str4d> You mentioned launchpad and debian above. Is there anything else you consider urgent to recovery?
+20:45:35 <zzz> 2) Meeh was doing some research on launchpad/debian which is our major outage. I need to compare notes with him
+20:46:05 <zzz> echelon and I traded emails with tails, they are worried about him and looking for a replacement.
+20:46:18 <zzz> I told them it's not going to happen from our side soon, their problem for now
+20:46:58 <zzz> all the other stuff around the build (geoip, tx) I have covered.
+20:47:16 <zzz> but launchpad/deb is a disaster. Nobody else knows anything, and nothing's written down
+20:47:58 <zzz> and what he did for 24 is incomplete, so there's even some more work to do on 24 before we get to 25
+20:48:16 <zzz> anything else on 2) ?
+20:48:42 <str4d> Would it be useful to put out a call for a new packager?
+20:48:50 <str4d> (e.g. Twitter?)
+20:48:53 <zzz> sure
+20:49:07 * zzz reaches for the baffer
+20:49:20 <str4d> sadie can figure out precise wording of the call
+20:49:49 <str4d> (we want it to be welcoming and encouraging without being too panicked ;) )
+20:49:56 <zzz> don't delegate every tweet to sadie, you are allowed to tweet also :)
+20:50:04 * zzz *bafffs* the meeting closed

i2p2www/meetings/logs/246.rst

@@ -0,0 +1,12 @@
+I2P dev meeting, March 19, 2016 @ 20:00 UTC
+===========================================
+
+Quick recap
+-----------
+
+* **Present:**
+
+orignal,
+str4d,
+z3r0fox,
+zzz

i2p2www/pages/downloads/macros

@@ -1,12 +1,12 @@
-{% set i2pinstall_windows_hash = '40a9d162b218c3280170b5e6e5e0f459a2c5348c9488222955be5312144eade9' %}
-{% set i2pinstall_jar_hash     = 'f5a06c4ed7e3c22048eef18901b85baa1f9bed3e507c212700723701036e2bb3' %}
-{% set i2psource_hash          = '134481ae5ef934a411545330d1b22e768189c424a65db47058db0f7d9cf51e7d' %}
-{% set i2pupdate_hash          = 'b8ee5d9c88924f631ae03ffcbed4ac0b06542e51cdd144e20dbaad69a8fdcef4' %}
+{% set i2pinstall_windows_hash = '094945d8728ca50195345b52c8154b2fdfa65b6af36adfcdb1fa2169f7401ebf' %}
+{% set i2pinstall_jar_hash     = '47c9d361940fc429effd57cc6718d72fde7a66663d5dfbb18fa30aba569b69fc' %}
+{% set i2psource_hash          = 'daaac2b5a5a6b5bbd4b805f76e14f6a7c201dfd7c1cf43c98e182d2e657d1236' %}
+{% set i2pupdate_hash          = '5245609257f80ab2177adc50593db239cc6e24bd9e39378c650a34e031451c01' %}
 {% set i2p_android_hash        = 'b14e3cc5ea12eb2e8bccb81dd2e86eeea3baba6695eb1a9f4d9053e76aeb131d' %}
 
 {% set i2p_android_version = '0.9.22' %}
 {% set i2p_android_version_kytv = '0.9.22' %}
-{% set i2p_android_version_fdroid = '0.9.19' %}
+{% set i2p_android_version_fdroid = '0.9.22' %}
 
 
 {% macro package_outer(type, name, icon) -%}

i2p2www/pages/downloads/mirrors

@@ -1,4 +1,4 @@
-{"net": "clearnet", "protocol": "https", "domain": "launchpad.net", "path": "/i2p/trunk/%(version)s/+download/%(file)s", "org": "Launchpad", "org_url": "https://launchpad.net", "country": "us"}
+#{"net": "clearnet", "protocol": "https", "domain": "launchpad.net", "path": "/i2p/trunk/%(version)s/+download/%(file)s", "org": "Launchpad", "org_url": "https://launchpad.net", "country": "us"}
 {"net": "clearnet", "protocol": "https", "domain": "download.i2p2.de", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no", "country": "no"}
 {"net": "i2p", "protocol": "http", "domain": "whnxvjwjhzsske5yevyokhskllvtisv5ueokw6yvh6t7zqrpra2q.b32.i2p", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no"}
 {"net": "clearnet", "protocol": "http", "domain": "download.i2p2.de", "path": "/releases/%(version)s/%(file)s", "org": "sigterm.no", "country": "no"}

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 &euro;</td><td>general fund</td></tr>
+ <tr><td>Dec, 2015</td><td>32C3 travel support</td><td></td><td>1900 &euro;</td><td>general fund</td></tr>
+ <tr><td>Dec, 2015</td><td>32C3 donuts, sweets, misc</td><td></td><td>107,73 &euro;</td><td>general fund</td></tr>
+ <tr><td>Dec, 2015</td><td>PayPal fees 2015</td><td></td><td>103,19 &euro;</td><td>general fund</td></tr>
+
 </table> 
 
-We do accept Monero as donations, too. Currently no income.
+We do accept Monero as donations, too. Already integrated. See above.
+
 <br />
 <br />
 <b>{{ _('2014 donations and costs:') }}</b><br />

i2p2www/pages/site/about/media.html

@@ -119,6 +119,14 @@ Replacing Weary Crypto: Upgrading the I2P network with stronger primitives
 str4d, Real World Crypto, Stanford, January 8, 2016
 {%- endtrans %}</li>
 
+<li>{% trans link='http://' + i2pconv('str4d.i2p')  + '/talks/2016-uww-i2p-slides.pdf',
+link2='http://' + i2pconv('str4d.i2p') + '/talks/2016-uww-i2p-slides.odp' -%}
+Onions and Garlic: the protocols of I2P
+<a href="{{ link }}">(pdf)</a>
+<a href="{{ link2 }}">(odp)</a>
+str4d, COMPSCI 460: Computer Networking, University of Wisconsin Whitewater, February 17, 2016
+{%- endtrans %}</li>
+
 </ul>
 
 <h2>{{ _('Tutorials') }}</h2>

i2p2www/pages/site/docs/api/samv3.html

@@ -757,7 +757,7 @@ This is all on one line (space separated), shown on multiple lines for clarity:
  All options are per-datagram settings that override the defaults specified in the SESSION CREATE.
 </li><li>
  Version 3.3 options SEND_TAGS, TAG_THRESHOLD, EXPIRES, and SEND_LEASESET
- will be passed to I2CP if supported. See <a href="..//i2cp#msg_SendMessageExpire">the I2CP specification</a> for details.
+ will be passed to I2CP if supported. See <a href="../protocol/i2cp#msg_SendMessageExpire">the I2CP specification</a> for details.
  Support by the SAM server is optional, it will ignore these options if unsupported.
 </li><li>
  this line is '\n' terminated.

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',

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

@@ -47,22 +47,22 @@ 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: March 22, 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>
 Custom icons for non-webapp plugins
 </li><li>
+Pure Java key pair generation
+</li><li>
 Bug fixes, translation updates, geoip updates
 </li></ul>
 
@@ -74,15 +74,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>
@@ -91,27 +91,41 @@ Bug fixes, translation updates, geoip updates
 
 
 
-<h2 id="v0.9.27">0.9.27 - 0.9.29</h2>
-<p><b>Time frame: 2nd Half 2016</b></p>
+<h2 id="v0.9.27">0.9.27</h2>
+<p><b>Target release date: July 2016</b></p>
 <ul><li>
-Pluggable transports?
-</li><li>
 Crypto migration for existing hidden services
 </li><li>
 Initial work on NTCP2
 </li><li>
 Initial work on New DH
 </li><li>
+Initial work on Pluggable transports
+</li></ul>
+
+
+
+<h2 id="v0.9.28">0.9.28</h2>
+<p><b>Target release date: September 2016</b></p>
+<ul><li>
+Further work on transports: DH/NTCP2/PT
+</li><li>
 Initial work on new crypto
 </li><li>
 Initial work on LS2 with multi-destination support
 </li><li>
+Console redesign phase 1
+</li></ul>
+
+
+
+<h2 id="v0.9.29">0.9.29</h2>
+<p><b>Target release date: November 2016</b></p>
+<ul><li>
 GMP 6.1
 </li><li>
 Initial work on new netdb ("next backend")
 </li><li>
-Console redesign phase 1
-</li><li>
 Initial work on new naming system with Grothoff
 </li><li>
 Jetty 9.2
@@ -138,9 +152,6 @@ NTCP Pumper redesign
 </li><li>
 I2PTunnel socket-side NIO
 </li><li>
-</li><li>
-</li><li>
-</li><li>
 Bug fixes, translation updates, geoip updates
 </li></ul>
 

i2p2www/spec/updates.rst

@@ -2,8 +2,8 @@
 Software Update Specification
 =============================
 .. meta::
-    :lastupdated: May 2015
-    :accuratefor: 0.9.20
+    :lastupdated: March 2016
+    :accuratefor: 0.9.25
 
 .. contents::
 
@@ -418,6 +418,9 @@ The following <feed> elements are used:
     <i2p:release>
         I2P update metadata. See below.
 
+    <i2p:revocations>
+        Certificate revocations. See below.
+
     <updated>
         Required
 
@@ -529,6 +532,33 @@ following attributes and entities:
             href (attribute)
                 An in-network http .i2p link
 
+**Atom <i2p:revocations> Details:**
+
+This entity is optional and there is at most one <i2p:revocations> entity in the
+feed. This feature is scheduled for implementation in release 0.9.26. The
+specification below is preliminary and subject to change.
+
+The <i2p:revocations> entity contains one or more <i2p:crl> entities. The
+<i2p:crl> entity contains the following attributes:
+
+    date (attribute)
+        Required
+
+        Timestamp for this entry (conforming to [RFC-4287]_ (Atom) section 3.3
+        and [RFC-3339]_.
+
+        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.
+
+    id (attribute)
+        A unique id for the creator of this CRL.
+
+The content of the <i2p:crl> 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 [RFC-5280]_ for more information on CRLs.
+
 
 Future Work
 ===========
@@ -551,10 +581,13 @@ References
     {{ spec_url('plugin') }}
 
 .. [RFC-3339]
-    http://tools.ietf.org/html/rfc3339
+    https://tools.ietf.org/html/rfc3339
 
 .. [RFC-4287]
-    http://tools.ietf.org/html/rfc4287
+    https://tools.ietf.org/html/rfc4287
+
+.. [RFC-5280]
+    https://tools.ietf.org/html/rfc5280
 
 .. [Signature]
     {{ ctags_url('Signature') }}

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