[or-cvs] r10810: Backport r10524: make it clear that LICENSE and AUTHORS are (in tor/branches/tor-0_1_2-patches: . doc)

[nickm at seul.org]

Author: nickm
Date: 2007-07-12 12:17:30 -0400 (Thu, 12 Jul 2007)
New Revision: 10810

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/AUTHORS
   tor/branches/tor-0_1_2-patches/LICENSE
   tor/branches/tor-0_1_2-patches/doc/TODO.012
Log:
 r13717 at 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.



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r13717] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_1_2-patches/AUTHORS
===================================================================
--- tor/branches/tor-0_1_2-patches/AUTHORS	2007-07-12 16:17:27 UTC (rev 10809)
+++ tor/branches/tor-0_1_2-patches/AUTHORS	2007-07-12 16:17:30 UTC (rev 10810)
@@ -1,4 +1,12 @@
+                    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:
 -------------
 

Modified: tor/branches/tor-0_1_2-patches/LICENSE
===================================================================
--- tor/branches/tor-0_1_2-patches/LICENSE	2007-07-12 16:17:27 UTC (rev 10809)
+++ tor/branches/tor-0_1_2-patches/LICENSE	2007-07-12 16:17:30 UTC (rev 10810)
@@ -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:
 

Modified: tor/branches/tor-0_1_2-patches/doc/TODO.012
===================================================================
--- tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:17:27 UTC (rev 10809)
+++ tor/branches/tor-0_1_2-patches/doc/TODO.012	2007-07-12 16:17:30 UTC (rev 10810)
@@ -4,12 +4,12 @@
   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 (??)