aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL2
-rw-r--r--README4
-rw-r--r--debian/control2
-rw-r--r--doc/HACKING8
-rw-r--r--doc/tor-doc-win32.html24
-rw-r--r--doc/tor-doc.html6
-rw-r--r--tor.spec.in6
7 files changed, 26 insertions, 26 deletions
diff --git a/INSTALL b/INSTALL
index 795f27632..de0210285 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
Quickstart version for users:
0) Download the absolute newest version. No, really.
- http://freehaven.net/tor/dist/
+ http://tor.eff.org/dist/
1) tar xvf it, and then cd into the directory.
2) ./configure
3) make
diff --git a/README b/README
index 286315177..24ff4f2ca 100644
--- a/README
+++ b/README
@@ -17,11 +17,11 @@ doesn't work for you.
Do you want to run a tor server?
- See http://freehaven.net/tor/doc/tor-doc.html#server
+ See http://tor.eff.org/doc/tor-doc.html#server
Do you want to run a hidden service?
- See http://freehaven.net/tor/doc/tor-doc.html#hidden-service
+ See http://tor.eff.org/doc/tor-doc.html#hidden-service
Configuring tsocks:
diff --git a/debian/control b/debian/control
index 7b8371204..5d1466ff6 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,6 @@ Description: anonymizing overlay network for TCP
Remember that this is development code -- don't rely on the current Tor
network if you really need strong anonymity.
.
- The latest information can be found at http://freehaven.net/tor/, or on the
+ The latest information can be found at http://tor.eff.org/, or on the
mailing lists, archived at http://archives.seul.org/or/dev/ or
http://archives.seul.org/or/announce/.
diff --git a/doc/HACKING b/doc/HACKING
index 09c780704..c0a1b6f48 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -463,10 +463,10 @@ the distant future, stuff may have changed.)
About Tor
- See http://freehaven.net/tor/
- http://freehaven.net/tor/cvs/doc/tor-spec.txt
- http://freehaven.net/tor/cvs/doc/tor-design.tex
- http://freehaven.net/tor/cvs/doc/FAQ
+ See http://tor.eff.org/
+ http://tor.eff.org/cvs/doc/tor-spec.txt
+ http://tor.eff.org/cvs/doc/tor-design.tex
+ http://tor.eff.org/cvs/doc/FAQ
About anonymity
diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index 936c84e75..793116070 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -9,16 +9,16 @@
<body>
-<h1>Running <a href="http://tor.freehaven.net/">Tor</a> on Win32</h1>
+<h1>Running <a href="http://tor.eff.org/">Tor</a> on Win32</h1>
<a name="installing"></a>
<h2>Step One: Download and Install Tor</h2>
<p>
The latest stable release of Tor for Windows 32 is <a
-href="http://tor.freehaven.net/dist/win32/tor-0.0.9.1-win32.exe">0.0.9.1</a>.
+href="http://tor.eff.org/dist/win32/tor-0.0.9.1-win32.exe">0.0.9.1</a>.
Download it by clicking the link. You may be able to find experimental versions
-<a href="http://tor.freehaven.net/dist/win32/">here</a>, if you're looking for
+<a href="http://tor.eff.org/dist/win32/">here</a>, if you're looking for
new features and new bugs.
</p>
@@ -27,7 +27,7 @@ screenshot of the setup page:
</p>
<img alt="tor installer splash page"
-src="http://tor.freehaven.net/img/screenshot-installer-splash.jpg" />
+src="http://tor.eff.org/img/screenshot-installer-splash.jpg" />
<p>
By default, Tor is not configured to run at startup.
@@ -37,7 +37,7 @@ Be sure to leave the other boxes checked.
</p>
<img alt="select components to install"
-src="http://tor.freehaven.net/img/screenshot-installer-components.jpg" />
+src="http://tor.eff.org/img/screenshot-installer-components.jpg" />
<p>Once the installer is finished, it will run Tor in a DOS window so
you can see its logs and errors. (You can minimize this window, but do
@@ -45,7 +45,7 @@ not close it.)
</p>
<img alt="tor window screenshot"
-src="http://tor.freehaven.net/img/screenshot-dos-window.jpg" />
+src="http://tor.eff.org/img/screenshot-dos-window.jpg" />
<p>Tor comes configured as a client by default. It uses a built-in
default configuration file, and most people won't need to change any of
@@ -63,7 +63,7 @@ appear in your system tray as a "P" in a circle, as pictured below:
</p>
<img alt="privoxy icon in the system tray"
-src="http://tor.freehaven.net/img/screenshot-privoxy-icon.jpg" />
+src="http://tor.eff.org/img/screenshot-privoxy-icon.jpg" />
<p>You need to configure Privoxy to use Tor.
Open Privoxy's main config file by selecting it from Start Menu|All
@@ -71,7 +71,7 @@ Programs:
</p>
<img border="1" alt="editing privoxy config"
-src="http://tor.freehaven.net/img/screenshot-privoxy-config.jpg" />
+src="http://tor.eff.org/img/screenshot-privoxy-config.jpg" />
<p>Add the line <br>
<tt>forward-socks4a / localhost:9050 .</tt><br>
@@ -81,7 +81,7 @@ the file. Be sure to save.
</p>
<img border="1" alt="privoxy points to tor"
-src="http://tor.freehaven.net/img/screenshot-privoxy-edit.jpg" />
+src="http://tor.eff.org/img/screenshot-privoxy-edit.jpg" />
<a name="using"></a>
<h2>Step Three: Configure your applications to use Tor</h2>
@@ -94,12 +94,12 @@ You should also set your SSL proxy (IE calls it "Secure") to the same
thing, to hide your SSL traffic. In IE, this looks something like:</p>
<img alt="LAN settings in IE"
-src="http://tor.freehaven.net/img/screenshot-ie-lan.jpg" />
+src="http://tor.eff.org/img/screenshot-ie-lan.jpg" />
<img alt="Proxy settings in IE"
-src="http://tor.freehaven.net/img/screenshot-ie-proxies.jpg" />
+src="http://tor.eff.org/img/screenshot-ie-proxies.jpg" />
<p>Using privoxy is <strong>necessary</strong> because <a
-href="http://tor.freehaven.net/cvs/tor/doc/CLIENTS">browsers leak your
+href="http://tor.eff.org/cvs/tor/doc/CLIENTS">browsers leak your
DNS requests when they use a SOCKS proxy directly</a>, which is bad for
your anonymity. Privoxy also removes certain dangerous headers from your
web requests, and blocks obnoxious ad sites like Doubleclick.</p>
diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index 9491d12ca..ea9d6000b 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -9,7 +9,7 @@
<body>
-<h1><a href="http://tor.freehaven.net/">Tor</a> documentation</h1>
+<h1><a href="http://tor.eff.org/">Tor</a> documentation</h1>
<p>Tor provides a distributed network of servers ("onion routers"). Users
bounce their communications (web requests, IM, IRC, SSH, etc.) around
@@ -159,7 +159,7 @@ installing, configuring, and using Tor on Win32.
</p>
<p>You can get the latest releases <a
-href="http://tor.freehaven.net/dist/">here</a>.</p>
+href="http://tor.eff.org/dist/">here</a>.</p>
<p>If you got Tor from a tarball, unpack it: <tt>tar xzf
tor-0.0.9.1.tar.gz; cd tor-0.0.9.1</tt>. Run <tt>./configure</tt>, then
@@ -191,7 +191,7 @@ top). Then change your browser to http proxy at localhost port 8118.
(In Mozilla, this is in Edit|Preferences|Advanced|Proxies.)
You should also set your SSL proxy to the same
thing, to hide your SSL traffic. Using privoxy is <b>necessary</b> because
-<a href="http://tor.freehaven.net/cvs/tor/doc/CLIENTS">Mozilla leaks your
+<a href="http://tor.eff.org/cvs/tor/doc/CLIENTS">Mozilla leaks your
DNS requests when it uses a SOCKS proxy directly</a>. Privoxy also gives
you good html scrubbing.</p>
diff --git a/tor.spec.in b/tor.spec.in
index 047bba1d9..a8c100d90 100644
--- a/tor.spec.in
+++ b/tor.spec.in
@@ -6,7 +6,7 @@
# This should be incremented whenever the spec file changes, but
# can drop back to zero at a new Tor version
-%define specver 3
+%define specver 0
## Things users may want to change
#
@@ -95,7 +95,7 @@ Version: %{version}
Release: %{release}
Summary: Anonymizing overlay network for TCP (The onion router)
-URL: http://freehaven.net/%{name}/
+URL: http://tor.eff.org/
Group: System Environment/Daemons
License: BSD-like
@@ -107,7 +107,7 @@ BuildRequires: openssl-devel >= 0.9.6, rpm-build >= 4.0
Requires(pre): shadow-utils, /usr/bin/id, /bin/date, /bin/sh
Requires(pre): %{_sbindir}/useradd, %{_sbindir}/groupadd
-Source0: http://freehaven.net/%{name}/dist/%{name}-%{native_version}.tar.gz
+Source0: http://tor.eff.org/dist/%{name}-%{native_version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root