From 92372b156afd945d2a7736844aae22febdd95016 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Dec 2007 23:42:59 +0000
Subject: [PATCH]  r16995@catbus:  nickm | 2007-12-06 18:42:53 -0500  patch
 from steve: replace more tor.eff.org instances with torproject.org

svn:r12707
---
 contrib/tor-ctrl.sh           |  4 ++--
 contrib/tor.nsi.in            |  2 +-
 doc/design-paper/blocking.tex |  2 +-
 src/config/torrc.sample.in    | 10 +++++-----
 src/or/buffers.c              |  4 ++--
 src/or/config.c               |  2 +-
 src/or/test.c                 |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/contrib/tor-ctrl.sh b/contrib/tor-ctrl.sh
index e28c45d613..d9c0137c42 100644
--- a/contrib/tor-ctrl.sh
+++ b/contrib/tor-ctrl.sh
@@ -23,7 +23,7 @@
 # use notations like 1mb, 1kb or the number of bytes.
 #
 # Many, many other things are possible, see
-#              http://tor.eff.org/svn/trunk/doc/spec/control-spec.txt
+#              http://www.torproject.org/svn/trunk/doc/spec/control-spec.txt
 #
 # Copyright (c) 2007 by Stefan Behte
 #
@@ -68,7 +68,7 @@ cat <<EOF
 
 tor-ctrl $VERSION by Stefan Behte (http://ge.mine.nu)
 You should have a look at 
-       http://tor.eff.org/svn/trunk/doc/spec/control-spec.txt 
+http://www.torproject.org/svn/trunk/doc/spec/control-spec.txt
 
 usage: tor-ctrl [-switch] [variable]
 
diff --git a/contrib/tor.nsi.in b/contrib/tor.nsi.in
index 363fe5d71b..5177174fe2 100644
--- a/contrib/tor.nsi.in
+++ b/contrib/tor.nsi.in
@@ -34,7 +34,7 @@
 
 !define VERSION "0.1.2.3-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
-!define WEBSITE "http://tor.eff.org/"
+!define WEBSITE "http://www.torproject.org/"
 
 !define LICENSE "..\LICENSE"
 ;BIN is where it expects to find tor.exe, tor_resolve.exe, libeay32.dll and
diff --git a/doc/design-paper/blocking.tex b/doc/design-paper/blocking.tex
index eaacb085b9..cf3f7eb1db 100644
--- a/doc/design-paper/blocking.tex
+++ b/doc/design-paper/blocking.tex
@@ -352,7 +352,7 @@ thousands of people from around the world. This diversity of
 users contributes to sustainability as above: Tor is used by
 ordinary citizens, activists, corporations, law enforcement, and
 even government and military users,
-%\footnote{\url{http://tor.eff.org/overview}}
+%\footnote{\url{http://www.torproject.org/overview}}
 and they can
 only achieve their security goals by blending together in the same
 network~\cite{econymics,usability:weis2006}. This user base also provides
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 6cb97e4c57..c644ee4057 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -6,8 +6,8 @@
 ## that begin with just "#" are disabled commands: you can enable them
 ## by removing the "#" symbol.
 ##
-## See the man page, or http://tor.eff.org/tor-manual-dev.html, for more
-## options you can use in this file.
+## See the man page, or http://www.torproject.org/tor-manual-dev.html,
+## for more options you can use in this file.
 ##
 ## Tor will look for this file in various places based on your platform:
 ## http://wiki.noreply.org/noreply/TheOnionRouter/TorFAQ#torrc
@@ -74,7 +74,7 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
 
 ## NOTE: If you enable these, you should consider mailing the contents of
 ## the "fingerprint" file to the tor-ops, so we have contact info for you
-## in case we need it. See http://tor.eff.org/docs/tor-doc-server.html.
+## in case we need it. See http://www.torproject.org/docs/tor-doc-relay.
 
 ## A unique handle for your server.
 #Nickname ididnteditheconfig
@@ -123,9 +123,9 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
 ## the default exit policy, end this with either a reject *:* or an
 ## accept *:*. Otherwise, you're _augmenting_ (prepending to) the
 ## default exit policy. Leave commented to just use the default, which is
-## available in the man page or at http://tor.eff.org/documentation.html
+## available in the man page or at http://www.torproject.org/documentation.html
 ##
-## Look at http://tor.eff.org/faq-abuse.html#TypicalAbuses
+## Look at http://www.torproject.org/faq-abuse.html#TypicalAbuses
 ## for issues you might encounter if you use the default exit policy.
 ##
 ## If certain IPs and ports are blocked externally, e.g. by your firewall,
diff --git a/src/or/buffers.c b/src/or/buffers.c
index fa87f44c2f..bf1f7e390b 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1439,8 +1439,8 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
 "Please configure your client accordingly.\n"
 "</p>\n"
 "<p>\n"
-"See <a href=\"http://tor.eff.org/documentation.html\">"
-           "http://tor.eff.org/documentation.html</a> for more information.\n"
+"See <a href=\"http://www.torproject.org/documentation.html\">"
+           "http://www.torproject.org/documentation.html</a> for more information.\n"
 "<!-- Plus this comment, to make the body response more than 512 bytes, so "
 "     IE will be willing to display it. Comment comment comment comment "
 "     comment comment comment comment comment comment comment comment.-->\n"
diff --git a/src/or/config.c b/src/or/config.c
index 86a642ffa7..a218a86947 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1901,7 +1901,7 @@ print_usage(void)
   printf(
 "Copyright 2001-2007 Roger Dingledine, Nick Mathewson.\n\n"
 "tor -f <torrc> [args]\n"
-"See man page for options, or http://tor.eff.org/ for documentation.\n");
+"See man page for options, or http://www.torproject.org/ for documentation.\n");
 }
 
 /** Print all non-obsolete torrc options. */
diff --git a/src/or/test.c b/src/or/test.c
index b3d6730116..75af4aedfa 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -2968,7 +2968,7 @@ test_rend_fns(void)
   char address1[] = "fooaddress.onion";
   char address2[] = "aaaaaaaaaaaaaaaa.onion";
   char address3[] = "fooaddress.exit";
-  char address4[] = "tor.eff.org";
+  char address4[] = "www.torproject.org";
   rend_service_descriptor_t *d1, *d2;
   char *encoded;
   size_t len;