merge of '1b9e425aaf5e3d1eac0405259be608005314e5a2'

and '6c6618728a160f6ee536f781d114197977411a1f'
This commit is contained in:
str4d
2013-08-30 23:30:37 +00:00
47 changed files with 239 additions and 209 deletions

View File

@@ -1,7 +1,6 @@
{"protocol": "http", "domain": "i2p.googlecode.com", "path": "/files/%(file)s", "org": "Google Code", "org_url": "http://code.google.com", "country": "us"}
{"protocol": "https", "domain": "i2p.googlecode.com", "path": "/files/%(file)s", "org": "Google Code", "org_url": "https://code.google.com", "country": "us"}
{"protocol": "https", "domain": "launchpad.net", "path": "/i2p/trunk/%(version)s/+download/%(file)s", "org": "Launchpad", "org_url": "https://launchpad.net", "country": "us"}
{"protocol": "http", "domain": "golden.mtveurope.org", "path": "/~yang/i2p_mirror/%(file)s", "org": "VServer.si", "org_url": "http://www.vserver.si", "country": "lu"}
{"protocol": "http", "domain": "a.mirror.geti2p.net", "path": "/releases/current/%(file)s", "org": "welterde", "country": "de"}
{"protocol": "http", "domain": "download.i2p2.no", "path": "/releases/current/%(file)s", "org": "meeh", "country": "no"}
{"protocol": "http", "domain": "a.mirror.geti2p.net", "path": "/releases/%(version)s/%(file)s", "org": "welterde", "country": "de"}
{"protocol": "http", "domain": "download.i2p2.no", "path": "/releases/%(version)s/%(file)s", "org": "meeh", "country": "no"}
{"protocol": "https", "domain": "googledrive.com", "path": "/host/0B4jHEq5G7_EPWV9UeERwdGplZXc/%(version)s/%(file)s", "org": "Google Drive", "country": "us"}

View File

@@ -138,7 +138,7 @@
year = {2011},
month = {January},
location = {DC},
www_pdf_url = {http://www.irongeek.com/downloads/Identifying\%20the\%20true\%20IP\%20of\%20I2P\%20service\%20hosts.pdf},
www_pdf_url = {http://www.irongeek.com/downloads/Identifying%20the%20true%20IP%20of%20I2P%20service%20hosts.pdf},
www_section = traffic,
}

View File

@@ -3,7 +3,7 @@
{% block content %}
<h2>Tor / Onion Routing</h2>
<i><a href="http://www.torproject.org/">[Tor]</a>
<i><a href="https://www.torproject.org/">[Tor]</a>
<a href="http://www.onion-router.net">[Onion Routing]</a></i>
<p>{% trans netdb=site_url('docs/how/network-database'), peerselection=site_url('docs/how/peer-selection') -%}
Tor and Onion Routing are both anonymizing proxy networks,

View File

@@ -597,7 +597,7 @@ Source code available.
</li>
<li>
<p><a href="http://{{ i2pconv('perv.i2p') }}/"><strong>{{ i2pconv('perv.i2p') }}</strong></a>
<p><a href="http://{{ i2pconv('identiguy.i2p') }}/"><strong>{{ i2pconv('identiguy.i2p') }}</strong></a>
{% trans %}Dynamically updated eepsite index.{% endtrans %}
<sup><em>[{{ _('service') }}]</em></sup></p>
</li>
@@ -645,6 +645,22 @@ Gateways allowing users on the public Internet to access eepsites.
<a href="http://i2p.to/"><strong>i2p.to</strong></a>
{% trans tino=i2pconv('tino.i2p') -%}
<a href="http://{{ tino }}/">tino's</a> inproxy on the public Internet.
{%- endtrans %}
<sup><em>[{{ _('service') }}]</em></sup>
</li>
<li>
<a href="http://i2p.us/"><strong>i2p.us</strong></a>
{% trans -%}
Another inproxy on the public Internet.
{%- endtrans %}
<sup><em>[{{ _('service') }}]</em></sup>
</li>
<li>
<a href="http://i2p.me/"><strong>i2p.me</strong></a>
{% trans -%}
Another inproxy on the public Internet.
{%- endtrans %}
<sup><em>[{{ _('service') }}]</em></sup>
</li>

View File

@@ -165,7 +165,7 @@ vulnerability to predecessor attacks. While the endpoints and gateways of
those tunnels will be randomly distributed across the network (perhaps even
including the tunnel creator in that set), another alternative is to use the
tunnel pathways themselves to pass along the request and response, as is done
in <a href="http://www.torproject.org/">Tor</a>. This, however, may lead to leaks
in <a href="https://www.torproject.org/">Tor</a>. This, however, may lead to leaks
during tunnel creation, allowing peers to discover how many hops there are later
on in the tunnel by monitoring the timing or <a
href="http://dev.i2p.net/pipermail/2005-October/001057.html">packet count</a> as

View File

@@ -681,7 +681,7 @@ See also the <a href="{{ comparisons }}">Network Comparisons Page</a>.
{%- endtrans %}</p>
<h2 id="similar.tor">Tor</h2>
<p><i><a href="http://www.torproject.org/">{% trans %}website{% endtrans %}</a></i></p>
<p><i><a href="https://www.torproject.org/">{% trans %}website{% endtrans %}</a></i></p>
<p>{% trans -%}
At first glance, Tor and I2P have many functional and anonymity related
@@ -1004,9 +1004,9 @@ It is hosted on <a href="http://{{ bob }}/Robert.html">http://{{ bob }}/Robert.h
<h2 id="app.pybit">PyBit</h2>
<p><i>{% trans dev='Blub' -%}Developed by: {{ dev }}{%- endtrans %}</i></p>
<p>{% trans pebcache=i2pconv('pebcache.i2p') -%}
<p>{% trans pybit='http://'+i2pconv('echelon.i2p')+'/pybit/' -%}
PyBit is a Bittorrent client written in Python.
It is hosted on <a href="http://{{ pebcache }}/">http://{{ pebcache }}/</a> <!-- TODO: expand -->
It is hosted on <a href="{{ pybit }}">{{ pybit }}</a> <!-- TODO: expand -->
{%- endtrans %}</p>
<h2 id="app.i2phex">I2Phex</h2>

View File

@@ -80,7 +80,7 @@ the current implementation does not.
I2P design started in 2003, not long after the advent of
<a href="http://www.onion-router.net">[Onion Routing]</a>,
<a href="http://freenetproject.org/">[Freenet]</a>, and
<a href="http://www.torproject.org/">[Tor]</a>.
<a href="https://www.torproject.org/">[Tor]</a>.
Our design benefits substantially from the research published around that time.
I2P uses several onion routing techniques, so we continue to benefit
from the significant academic interest in Tor.
@@ -574,7 +574,7 @@ Working directly with DPI and obfuscation experts
{%- endtrans %}</li>
</ul>
<p>{% trans pdf='http://www.cse.chalmers.se/%7Ejohnwolf/publications/hjelmvik_breaking.pdf' -%}
<p>{% trans pdf='http://www.iis.se/docs/hjelmvik_breaking.pdf' -%}
Reference: <a href="{{ pdf }}">Breaking and Improving Protocol Obfuscation</a>
{%- endtrans %}</p>

View File

@@ -159,7 +159,7 @@ However, as NTCP buffers are partially in the kernel and SSU buffers are on the
that assumption is difficult to verify.
{%- endtrans %}</p>
<p>{% trans pdf='http://www.cse.chalmers.se/%7Ejohnwolf/publications/hjelmvik_breaking.pdf' -%}
<p>{% trans pdf='http://www.iis.se/docs/hjelmvik_breaking.pdf' -%}
Analyze <a href="{{ pdf }}">Breaking and Improving Protocol Obfuscation</a>
and see how transport-layer padding may improve things.
{%- endtrans %}</p>

View File

@@ -492,7 +492,7 @@ vulnerability to predecessor attacks. While the endpoints and gateways of
those tunnels will be randomly distributed across the network (perhaps even
including the tunnel creator in that set), another alternative is to use the
tunnel pathways themselves to pass along the request and response, as is done
in <a href="http://www.torproject.org/">TOR</a>. This, however, may lead to leaks
in <a href="https://www.torproject.org/">TOR</a>. This, however, may lead to leaks
during tunnel creation, allowing peers to discover how many hops there are later
on in the tunnel by monitoring the timing or packet count as the tunnel is
built. Techniques could be used to minimize this issue, such as using each of

View File

@@ -272,7 +272,7 @@ The best way to stay "better-connected" to the network is to <a href="http://loc
<h3 id="exit">{% trans %}Is my router an "exit node" to the regular Internet? I don't want it to be.{% endtrans %}
<span class="permalink">(<a href="#exit">{{ _('link') }}</a>)</span></h3>
<p>{% trans -%}
No. Unlike <a href="http://www.torproject.org/">Tor</a>,
No. Unlike <a href="https://www.torproject.org/">Tor</a>,
"exit nodes" or "outproxies" are not an inherent part of the network.
Only volunteers who set up and run separate applications will relay traffic to the regular Internet.
There are very, very few of these.
@@ -290,7 +290,7 @@ and set your outproxy list to 'false.i2p' (only).
Then stop and restart the eepProxy.
If it doesn't work, the outproxy is not up. It is not I2P's fault.
If your primary reason to use an anonymous network is to anonymously access sites
on the regular Internet, you should probably try <a href="http://www.torproject.org/">Tor</a>.
on the regular Internet, you should probably try <a href="https://www.torproject.org/">Tor</a>.
{%- endtrans %}</p>
<h3 id="https">{% trans %}I can't access https:// or ftp:// sites through I2P.{% endtrans %}
@@ -368,16 +368,16 @@ There is additional discussion about this on <a href="http://{{ zzz }}/topics/21
<p>{% trans -%}
Unless an outproxy has been set up for the service you want to connect to, this cannot be done.
There are only three types of outproxies running right now: HTTP, HTTPS, and email. Note that there is not a SOCKS outproxy.
If this type of service is required, try <a href="http://www.torproject.org/">Tor</a>.
If this type of service is required, try <a href="https://www.torproject.org/">Tor</a>.
{%- endtrans %}</p>
<h3 id="down">{% trans %}Most of the eepsites within I2P are down?{% endtrans %}
<span class="permalink">(<a href="#down">{{ _('link') }}</a>)</span></h3>
<p>{% trans perv=i2pconv('perv.i2p') -%}
<p>{% trans eepstatus='http://'+i2pconv('identiguy.i2p') -%}
If you consider every eepsite that has ever been created, yes, most of them are down.
People and eepsites come and go.
A good way to get started in I2P is check out a list of eepsites that are currently up.
<a href="http://{{ perv }}/stats.cgi">{{ perv }}</a> tracks active eepsites.
<a href="{{ eepstatus }}">{{ eepstatus }}</a> tracks active eepsites.
{%- endtrans %}</p>
<h3 id="myeepsite">{% trans %}How do I set up my own eepsite?{% endtrans %}

View File

@@ -102,7 +102,7 @@ The initial pull may take several hours using the tunnel.
If it fails after a partial pull, simply rerun it, it will start where it left off.
If you are in a hurry, use the non-anonymous access.
{%- endtrans %}</p>
<p>{% trans viewmtn='http://'+i2pconv('stats.i2p')+'/cgi-bin/viewmtn/' -%}
<p>{% trans viewmtn='http://'+i2pconv('killyourtv.i2p')+'/viewmtn/' -%}
A full list of branches, including i2p.i2p and i2p.www can be found on <a href="{{ viewmtn }}">viewmtn</a>.
{%- endtrans %}</p>
<p>{% trans monotone=site_url('get-involved/guides/monotone') -%}

View File

@@ -17,10 +17,10 @@ See also the page with
<!--<li><a href="http://www.isdpodcast.com/">InfoSec Daily Podcast</a></li>-->
<li><a href="http://www.abenteuerland.at/onioncat/">Onioncat</a></li>
<li><a href="https://www.relakks.com/?cid=gb">Relakks</a></li>
<li><a href="http://www.pegasusnk.org/">The Pegasus Project</a></li>
<!--<li><a href="http://www.pegasusnk.org/">The Pegasus Project</a></li>-->
<!--<li><a href="http://www.thepegasuspress.com/">The Pegasus Press</a></li>-->
<li><a href="http://telecomix.org/">Telecomix</a></li>
<li><a href="http://www.torproject.org/">Tor</a></li>
<li><a href="https://www.torproject.org/">Tor</a></li>
<h4>{{ _('More Projects and Documentation') }}</h4>
<li><a href="http://freehaven.net/anonbib/topic.html">Freehaven's Anonymity Bibliography</a></li>
<li><a href="https://gnunet.org/links">GNUNet's related projects</a></li>