[or-cvs] r12707: patch from steve: replace more tor.eff.org instances with to (in tor/trunk: . contrib doc/design-paper src/config src/or)
nickm at seul.org
nickm at seul.org
Thu Dec 6 23:42:59 UTC 2007
Author: nickm
Date: 2007-12-06 18:42:59 -0500 (Thu, 06 Dec 2007)
New Revision: 12707
Modified:
tor/trunk/
tor/trunk/contrib/tor-ctrl.sh
tor/trunk/contrib/tor.nsi.in
tor/trunk/doc/design-paper/blocking.tex
tor/trunk/src/config/torrc.sample.in
tor/trunk/src/or/buffers.c
tor/trunk/src/or/config.c
tor/trunk/src/or/test.c
Log:
r16995 at catbus: nickm | 2007-12-06 18:42:53 -0500
patch from steve: replace more tor.eff.org instances with torproject.org
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r16995] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: tor/trunk/contrib/tor-ctrl.sh
===================================================================
--- tor/trunk/contrib/tor-ctrl.sh 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/contrib/tor-ctrl.sh 2007-12-06 23:42:59 UTC (rev 12707)
@@ -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 @@
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]
Modified: tor/trunk/contrib/tor.nsi.in
===================================================================
--- tor/trunk/contrib/tor.nsi.in 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/contrib/tor.nsi.in 2007-12-06 23:42:59 UTC (rev 12707)
@@ -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
Modified: tor/trunk/doc/design-paper/blocking.tex
===================================================================
--- tor/trunk/doc/design-paper/blocking.tex 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/doc/design-paper/blocking.tex 2007-12-06 23:42:59 UTC (rev 12707)
@@ -352,7 +352,7 @@
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
Modified: tor/trunk/src/config/torrc.sample.in
===================================================================
--- tor/trunk/src/config/torrc.sample.in 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/src/config/torrc.sample.in 2007-12-06 23:42:59 UTC (rev 12707)
@@ -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 @@
## 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 @@
## 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,
Modified: tor/trunk/src/or/buffers.c
===================================================================
--- tor/trunk/src/or/buffers.c 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/src/or/buffers.c 2007-12-06 23:42:59 UTC (rev 12707)
@@ -1439,8 +1439,8 @@
"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"
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/src/or/config.c 2007-12-06 23:42:59 UTC (rev 12707)
@@ -1901,7 +1901,7 @@
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. */
Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c 2007-12-06 21:07:42 UTC (rev 12706)
+++ tor/trunk/src/or/test.c 2007-12-06 23:42:59 UTC (rev 12707)
@@ -2968,7 +2968,7 @@
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;
More information about the tor-commits
mailing list