14 files changed, 21 insertions, 27 deletions
diff --git a/README b/README
index da7d6615f9..9cde723ef2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
 
 Tor is an implementation of Onion Routing. You can read more
-at http://tor.eff.org/
+at https://www.torproject.org/
 
diff --git a/doc/design-paper/tor-design.bib b/doc/design-paper/tor-design.bib
index cb8282c19b..3ab04e95f8 100644
--- a/doc/design-paper/tor-design.bib
+++ b/doc/design-paper/tor-design.bib
@@ -199,13 +199,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,
@@ -1134,7 +1134,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/control-spec.txt b/doc/spec/control-spec.txt
index 3cae676d9a..af0adca26d 100644
--- a/doc/spec/control-spec.txt
+++ b/doc/spec/control-spec.txt
@@ -299,8 +299,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 732970d863..b98693e797 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 0064eb3169..23429925f5 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 0064eb3169..23429925f5 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 0064eb3169..23429925f5 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 0064eb3169..23429925f5 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 0064eb3169..23429925f5 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 0064eb3169..23429925f5 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 333986fc9f..8b2a93ee7c 100644
--- a/doc/tor-osx-dmg-creation.txt
+++ b/doc/tor-osx-dmg-creation.txt
@@ -42,7 +42,7 @@ file privoxyosx_setup_3.0.6.zip
 
 ## Compiling Tor
 
-1) Get your preferred version of the tor source from tor.eff.org.
+1) Get your preferred version of the tor source from https://www.torproject.org/
 
 2) In the top level, this means /path/to/tor/, not tor/contrib/osx,
 do a configure with these parameters:
@@ -82,7 +82,7 @@ by default, in /usr/local/lib/.
 /usr/local/lib/libevent.a (for architecture i386):      current ar archive random library
 /usr/local/lib/libevent.a (for architecture ppc):       current ar archive
 
-6) Get your preferred version of the tor source from tor.eff.org.
+6) Get your preferred version of the tor source from https://www.torproject.org/
 
 7) In the top level, this means /path/to/tor/, not tor/contrib/osx,
 do a configure with these parameters:
diff --git a/doc/tor-switchproxy.html b/doc/tor-switchproxy.html
index 0064eb3169..23429925f5 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 ac85ca94c4..3880a47f8f 100644
--- a/doc/tor-win32-mingw-creation.txt
+++ b/doc/tor-win32-mingw-creation.txt
@@ -77,32 +77,26 @@ Type "make -f win32/Makefile.gcc"
 Done.
 
 
-Stage Four: Download, extract, and patch libevent-1.3b.
+Stage Four: Download, extract, and patch libevent-1.3e.
 ------------------------------------------------------
 
-Download libevent-1.3b:
+Download libevent-1.3e:
 http://www.monkey.org/~provos/libevent/
 
 Copy the libevent tarball into the "tor-mingw" directory.
 Type "cd tor-mingw"
 
 Extract libevent: 
-Type "tar zxf libevent-1.3b.tar.gz"
+Type "tar zxf libevent-1.3e.tar.gz"
 
 Type "./configure --enable-static --disable-shared"
---------------------libevent 1.3b only---------------------------------------
-You need to manually edit the Makefile and remove all references to "sample".
-libevent 1.3b won't compile in mingw currently due to issues in event_test.c.
-Removing the "sample" directory and all references to it in Makefile create a
-completely valid libevent library.
------------------------------------------------------------------------------
 Type "make"
 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 e6ae1713a5..ab5b535877 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -1083,7 +1083,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.