diff --git a/i2p2www/pages/site/comparison/tor.html b/i2p2www/pages/site/comparison/tor.html index e1c15fd8..4b972f33 100644 --- a/i2p2www/pages/site/comparison/tor.html +++ b/i2p2www/pages/site/comparison/tor.html @@ -3,7 +3,7 @@ {% block content %}

Tor / Onion Routing

-[Tor] +[Tor] [Onion Routing]

{% trans netdb=site_url('docs/how/network-database'), peerselection=site_url('docs/how/peer-selection') -%} Tor and Onion Routing are both anonymizing proxy networks, diff --git a/i2p2www/pages/site/docs/discussions/tunnel.html b/i2p2www/pages/site/docs/discussions/tunnel.html index bd8995b7..0a172038 100644 --- a/i2p2www/pages/site/docs/discussions/tunnel.html +++ b/i2p2www/pages/site/docs/discussions/tunnel.html @@ -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 Tor. This, however, may lead to leaks +in Tor. 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 diff --git a/i2p2www/pages/site/docs/how/tech-intro.html b/i2p2www/pages/site/docs/how/tech-intro.html index aa7fdc9e..72efb333 100644 --- a/i2p2www/pages/site/docs/how/tech-intro.html +++ b/i2p2www/pages/site/docs/how/tech-intro.html @@ -681,7 +681,7 @@ See also the Network Comparisons Page. {%- endtrans %}

Tor

-

{% trans %}website{% endtrans %}

+

{% trans %}website{% endtrans %}

{% trans -%} At first glance, Tor and I2P have many functional and anonymity related diff --git a/i2p2www/pages/site/docs/how/threat-model.html b/i2p2www/pages/site/docs/how/threat-model.html index 1fd3b026..5553f7ac 100644 --- a/i2p2www/pages/site/docs/how/threat-model.html +++ b/i2p2www/pages/site/docs/how/threat-model.html @@ -80,7 +80,7 @@ the current implementation does not. I2P design started in 2003, not long after the advent of [Onion Routing], [Freenet], and -[Tor]. +[Tor]. 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. diff --git a/i2p2www/pages/site/docs/tunnels/old-implementation.html b/i2p2www/pages/site/docs/tunnels/old-implementation.html index 88c5c40d..456f0c25 100644 --- a/i2p2www/pages/site/docs/tunnels/old-implementation.html +++ b/i2p2www/pages/site/docs/tunnels/old-implementation.html @@ -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 TOR. This, however, may lead to leaks +in TOR. 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 diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html index 3f9e727b..9fcdf1c8 100644 --- a/i2p2www/pages/site/faq.html +++ b/i2p2www/pages/site/faq.html @@ -272,7 +272,7 @@ The best way to stay "better-connected" to the network is to {% trans %}Is my router an "exit node" to the regular Internet? I don't want it to be.{% endtrans %} ({{ _('link') }})

{% trans -%} -No. Unlike Tor, +No. Unlike Tor, "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 Tor. +on the regular Internet, you should probably try Tor. {%- endtrans %}

{% trans %}I can't access https:// or ftp:// sites through I2P.{% endtrans %} @@ -368,7 +368,7 @@ There is additional discussion about this on Tor. +If this type of service is required, try Tor. {%- endtrans %}

{% trans %}Most of the eepsites within I2P are down?{% endtrans %} diff --git a/i2p2www/pages/site/links.html b/i2p2www/pages/site/links.html index d781d2b4..7f48b857 100644 --- a/i2p2www/pages/site/links.html +++ b/i2p2www/pages/site/links.html @@ -20,7 +20,7 @@ See also the page with
  • The Pegasus Project
  • Telecomix
  • -
  • Tor
  • +
  • Tor
  • {{ _('More Projects and Documentation') }}

  • Freehaven's Anonymity Bibliography
  • GNUNet's related projects