[or-cvs] [pytorctl/master] Add LICENSE file and update copyrights.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Thu, 18 Nov 2010 11:48:47 -0800
Subject: Add LICENSE file and update copyrights.
Commit: 4ec2e2be581c5b4adb25992c33fcae6e1b9f3bdc

---
 GeoIPSupport.py |    1 +
 LICENSE         |   33 +++++++++++++++++++++++++++++++++
 PathSupport.py  |    1 +
 SQLSupport.py   |    1 +
 ScanSupport.py  |    2 ++
 TorCtl.py       |    2 +-
 TorUtil.py      |    4 ++--
 7 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 LICENSE

diff --git a/GeoIPSupport.py b/GeoIPSupport.py
index e973848..7652aed 100644
--- a/GeoIPSupport.py
+++ b/GeoIPSupport.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# Copyright 2007 Johannes Renner and Mike Perry. See LICENSE file.
 
 import struct
 import socket
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..567bf67
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,33 @@
+===============================================================================
+The Python Tor controller code is distributed under this license:
+
+Copyright 2005, Nick Mathewson, Roger Dingledine
+Copyright 2007-2010, Mike Perry
+
+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.
diff --git a/PathSupport.py b/PathSupport.py
index 1aff15f..3fefb24 100644
--- a/PathSupport.py
+++ b/PathSupport.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# Copyright 2007-2010 Mike Perry. See LICENSE file.
 """
 
 Support classes for path construction
diff --git a/SQLSupport.py b/SQLSupport.py
index 509097e..2532973 100644
--- a/SQLSupport.py
+++ b/SQLSupport.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# Copyright 2009-2010 Mike Perry. See LICENSE file.
 
 """
 
diff --git a/ScanSupport.py b/ScanSupport.py
index 629adce..d102c78 100644
--- a/ScanSupport.py
+++ b/ScanSupport.py
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+# Copyright 2009-2010 Mike Perry. See LICENSE file.
 import PathSupport
 import threading
 import copy
diff --git a/TorCtl.py b/TorCtl.py
index 1dbae8d..4ce87cb 100755
--- a/TorCtl.py
+++ b/TorCtl.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # TorCtl.py -- Python module to interface with Tor Control interface.
 # Copyright 2005 Nick Mathewson
-# Copyright 2007 Mike Perry. See LICENSE file.
+# Copyright 2007-2010 Mike Perry. See LICENSE file.
 
 """
 Library to control Tor processes.
diff --git a/TorUtil.py b/TorUtil.py
index 4f62379..5f53628 100644
--- a/TorUtil.py
+++ b/TorUtil.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # TorCtl.py -- Python module to interface with Tor Control interface.
-# Copyright 2007 Mike Perry -- See LICENSE for licensing information.
-# Portions Copyright 2005 Nick Matthewson
+# Copyright 2007-2010 Mike Perry -- See LICENSE for licensing information.
+# Portions Copyright 2005 Nick Mathewson
 
 """
 TorUtil -- Support functions for TorCtl.py and metatroller
-- 
1.7.1