r13717@catbus: nickm | 2007-07-12 12:14:20 -0400

 Backport r10524: make it clear that LICENSE and AUTHORS are the license and authors for Tor only.


svn:r10810

3 files changed, 21 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index dc32abebe9..8f8d48486a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,11 @@
+                    This file lists the authors for Tor,
+        a free software project to provide anonymity on the Internet.
+
+       For more information about Tor, see http://www.torproject.org/.
+
+             If you got this file as a part of a larger bundle,
+        there are probably other authors that you should be aware of.
+
 
 Main authors:
 -------------
diff --git a/LICENSE b/LICENSE
index d0e66cb47a..cdd40e920d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,14 @@
+                    This file contains the license for Tor,
+        a free software project to provide anonymity on the Internet.
+
+        It also lists the licenses for other components used by Tor.
+
+       For more information about Tor, see http://www.torproject.org/.
+
+             If you got this file as a part of a larger bundle,
+        there may be other license terms that you should be aware of.
+
+
 ===============================================================================
 Tor is distributed under this license:
 
diff --git a/doc/TODO.012 b/doc/TODO.012
index 61bf76e23f..e1323de752 100644
--- a/doc/TODO.012
+++ b/doc/TODO.012
@@ -4,12 +4,12 @@ Backport items for 0.1.2:
   o r10248: handle lack of nul at end of mmaped data.
   - r10346: Try even harder not to look at the first byte after an mmap.
   o r10376, r10396: Fix segfaults in directory code
-  - r10478: stop tearing down entire circuits because the user asked for
+  o r10478: stop tearing down entire circuits because the user asked for
 	    a nonexistent hidden service port
   - r10493: weight guard selection by bandwidth (??)
   o r10495: change an assert into a tor_assert
   - r10521: fix an impossible (?) memory leak (??)
-  - r10524: make the LICENSE and AUTHORS files mention Tor.
+  o r10524: make the LICENSE and AUTHORS files mention Tor.
   o r10563: use correct types with desc_digest_map.
   o r10566: build correctly on systems where size_t is bigger than ulong. 
   - r10579: new addsysuser implementation for osx (??)