And more places with the wrong url, now updated.

svn:r12267

17 files changed, 54 insertions, 50 deletions

diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh
index 2b436d9dc..e562a7863 100644
--- a/contrib/package_nsis-mingw.sh
+++ b/contrib/package_nsis-mingw.sh
@@ -1,34 +1,38 @@
 #!/bin/sh
-# Copyright (c) 2006-2007 Andrew Lewman
-#
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions are
-#met:
-#
-#    * Redistributions of source code must retain the above copyright
-#notice, this list of conditions and the following disclaimer.
-#
-#    * Redistributions in binary form must reproduce the above
-#copyright notice, this list of conditions and the following disclaimer
-#in the documentation and/or other materials provided with the
-#distribution.
 #
-#    * Neither the names of the copyright owners nor the names of its
-#contributors may be used to endorse or promote products derived from
-#this software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#===============================================================================
+# ===============================================================================
+# package_nsis-ming.sh is distributed under this license:
+
+# Copyright (c) 2006-2007 Andrew Lewman
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+
+#     * Neither the names of the copyright owners nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# ===============================================================================
 
 # Script to package a Tor installer on win32.  This script assumes that
 # you have already built Tor, that you are running msys/mingw, and that
diff --git a/doc/TODO b/doc/TODO
index 52f47944d..96711794b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -17,7 +17,7 @@ J       - Jeff claims
 Things we'd like to do in 0.2.0.x:
   - See also Flyspray tasks.
   - See also all items marked XXXX020 and DOCDOC in the code
-  - http://tor.eff.org/eff/legal-faq.html#License doesn't mention
+  - https://www.torproject.org/eff/legal-faq.html#License doesn't mention
     licenses for other components of the bundles.
 
   - Before the feature freeze: (Nick)
diff --git a/doc/design-paper/tor-design.bib b/doc/design-paper/tor-design.bib
index 37cd20ff5..95aba9392 100644
--- a/doc/design-paper/tor-design.bib
+++ b/doc/design-paper/tor-design.bib
@@ -237,13 +237,13 @@
 @Misc{tor-spec,
    author =      {Roger Dingledine and Nick Mathewson},
    title =       {Tor Protocol Specifications},
-   note =        {\url{http://tor.eff.org/svn/trunk/doc/tor-spec.txt}},
+   note =        {\url{https://www.torproject.org/svn/trunk/doc/tor-spec.txt}},
 }
 
 @Misc{incentives-txt,
    author =      {Roger Dingledine and Nick Mathewson},
    title =       {Tor Incentives Design Brainstorms},
-   note =        {\url{http://tor.eff.org/svn/trunk/doc/incentives.txt}},
+   note =        {\url{https://www.torproject.org/svn/trunk/doc/incentives.txt}},
 }
 
 @InProceedings{BM:mixencrypt,
@@ -1172,7 +1172,7 @@
   booktitle = {Proceedings of the 13th USENIX Security Symposium},
   year = {2004},
   month = {August},
-  note = {\url{http://tor.eff.org/tor-design.pdf}}
+  note = {\url{https://www.torproject.org/tor-design.pdf}}
 }
 
 @inproceedings{flow-correlation04,
diff --git a/doc/spec/address-spec.txt b/doc/spec/address-spec.txt
index 92651a069..966f34c3d 100644
--- a/doc/spec/address-spec.txt
+++ b/doc/spec/address-spec.txt
@@ -6,8 +6,8 @@ $Id$
 1. Overview
 
   Most of the time, Tor treats user-specified hostnames as opaque:  When the
-  user connects to tor.eff.org, Tor picks an exit node and uses that node to
-  connect to "tor.eff.org".  Some hostnames, however, can be used to override
+  user connects to www.torproject.org, Tor picks an exit node and uses that node to
+  connect to "www.torproject.org".  Some hostnames, however, can be used to override
   Tor's default behavior and circuit-building rules.
 
   These hostnames can be passed to Tor as the address part of a SOCKS4a or
diff --git a/doc/spec/control-spec.txt b/doc/spec/control-spec.txt
index d1cab4f6c..a2826241c 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -317,8 +317,8 @@ $Id$
   address.
 
   Example:
-    C: MAPADDRESS 0.0.0.0=tor.eff.org 1.2.3.4=tor.freehaven.net
-    S: 250-127.192.10.10=tor.eff.org
+    C: MAPADDRESS 0.0.0.0=torproject.org 1.2.3.4=tor.freehaven.net
+    S: 250-127.192.10.10=torproject.org
     S: 250 1.2.3.4=tor.freehaven.net
 
   {Note: This feature is designed to be used to help Tor-ify applications
diff --git a/doc/spec/rend-spec.txt b/doc/spec/rend-spec.txt
index 44aefe7e0..3f8b57a74 100644
--- a/doc/spec/rend-spec.txt
+++ b/doc/spec/rend-spec.txt
@@ -4,7 +4,7 @@ $Id$
 
 0. Overview and preliminaries
 
-   Read http://tor.eff.org/doc/design-paper/tor-design.html#sec:rendezvous
+   Read https://www.torproject.org/doc/design-paper/tor-design.html#sec:rendezvous
    before you read this specification. It will make more sense.
 
    Rendezvous points provide location-hidden services (server
diff --git a/doc/tor-doc-osx.html b/doc/tor-doc-osx.html
index 0064eb316..23429925f 100644
--- a/doc/tor-doc-osx.html
+++ b/doc/tor-doc-osx.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-doc-server.html b/doc/tor-doc-server.html
index 0064eb316..23429925f 100644
--- a/doc/tor-doc-server.html
+++ b/doc/tor-doc-server.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-doc-unix.html b/doc/tor-doc-unix.html
index 0064eb316..23429925f 100644
--- a/doc/tor-doc-unix.html
+++ b/doc/tor-doc-unix.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-doc-win32.html b/doc/tor-doc-win32.html
index 0064eb316..23429925f 100644
--- a/doc/tor-doc-win32.html
+++ b/doc/tor-doc-win32.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-doc.html b/doc/tor-doc.html
index 0064eb316..23429925f 100644
--- a/doc/tor-doc.html
+++ b/doc/tor-doc.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-hidden-service.html b/doc/tor-hidden-service.html
index 0064eb316..23429925f 100644
--- a/doc/tor-hidden-service.html
+++ b/doc/tor-hidden-service.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-osx-dmg-creation.txt b/doc/tor-osx-dmg-creation.txt
index 1a0322a2f..ee0ec0ca9 100644
--- a/doc/tor-osx-dmg-creation.txt
+++ b/doc/tor-osx-dmg-creation.txt
@@ -64,7 +64,7 @@ Place into a location of your choosing, remember this location.
 9) Get the torbutton LICENSE file from https://torbutton.torproject.org.
 Place into a location of your choosing, remember this location.
 
-10) Get your preferred version of the tor source from https://tor.eff.org/download.  
+10) Get your preferred version of the tor source from https://www.torproject.org/download.  
 Extract the tarball.
 
 11) Update three variables in contrib/osx/package.sh:
@@ -133,7 +133,7 @@ Place into a location of your choosing, remember this location.
 2) Get the torbutton LICENSE file from https://torbutton.torproject.org.  
 Place into a location of your choosing, remember this location.
 
-3) Get your preferred version of the tor source from tor.eff.org.  Extract the
+3) Get your preferred version of the tor source from https://www.torproject.org.  Extract the
 tarball.
 
 4) Update three variables in contrib/osx/package.sh:
diff --git a/doc/tor-rpm-creation.txt b/doc/tor-rpm-creation.txt
index aa2601341..0a819ff74 100644
--- a/doc/tor-rpm-creation.txt
+++ b/doc/tor-rpm-creation.txt
@@ -56,7 +56,7 @@ system, you can replace "linux" with your operating system.
 
 The process used to create the distributed rpms is as follows:
 
-Download and Extract the latest tor source code from https://tor.eff.org/.
+Download and Extract the latest tor source code from https://www.torproject.org/.
 In the Tor directory:
 ./configure --enable-eventdns --enable-static --disable-shared
 make dist-rpm
diff --git a/doc/tor-switchproxy.html b/doc/tor-switchproxy.html
index 0064eb316..23429925f 100644
--- a/doc/tor-switchproxy.html
+++ b/doc/tor-switchproxy.html
@@ -10,7 +10,7 @@
 
 <p>
 This document is obsolete. See the new <a
-href="http://tor.eff.org/documentation.html">Tor documentation</a> page.
+href="https://www.torproject.org/documentation.html">Tor documentation</a> page.
 </p>
 
 </body>
diff --git a/doc/tor-win32-mingw-creation.txt b/doc/tor-win32-mingw-creation.txt
index 23179c87e..f7515afe4 100644
--- a/doc/tor-win32-mingw-creation.txt
+++ b/doc/tor-win32-mingw-creation.txt
@@ -101,7 +101,7 @@ Type "make install"
 Stage Five:  Build Tor
 ----------------------
 
-Download the current Tor alpha release from http://tor.eff.org/download.html.
+Download the current Tor alpha release from https://www.torproject.org/download.html.
 Copy the Tor tarball into the "tor-mingw" directory.
 Extract Tor:
 Type "tar zxf latest-tor-alpha.tar.gz"
diff --git a/doc/tor.1.in b/doc/tor.1.in
index d98d59c58..39683b9b5 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -1237,7 +1237,7 @@ The private key for this hidden service.
 .BR tsocks (1),
 .BR torify (1)
 
-.BR http://tor.eff.org/
+.BR https://www.torproject.org/
 
 .SH BUGS
 Plenty, probably. Tor is still in development. Please report them.