commit 003bbd7e8f0ad01300d4b0365302b31a921da37c Author: Damian Johnson atagar@torproject.org Date: Fri Aug 23 09:08:18 2013 -0700

Assigning stem's copyright to the Tor Project

Revising the copyright notices throughout stem so both the Tor Project and I have copyright. This has a couple advantages...

1. If I get nailed by the bus or otherwise somehow disappear then I want the Tor Project to have copyright. This will make life easier for any future stem maintainer by allowing them to share code with our other (mostly BSD licensed) projects.

2. Contributors are understandably antsy about giving copyright to an individual rather than an organization. Thus far I've been able to largely sidestep those concerns by asking for contributions to be in the public domain, but there was one occasion where that was a no-go...

https://trac.torproject.org/projects/tor/ticket/7566

Hopefully assigning copyright to the Tor Project is something that'll make everyone happy.

I've contacted Sean and he's fine with assigning the copyright for his stem contrutions to the Tor Project...

Yes, I am still interested in and willing to assign my existing and future contributions (unless I explicitly say otherwise) to Stem to the Tor Project. If the previous sentence is not legally binding enough, let me know.

Tweaked the FAQ entry a bit to reflect this change. --- docs/faq.rst | 2 +- run_tests.py | 2 +- setup.py | 2 +- stem/__init__.py | 3 +-- stem/connection.py | 2 +- stem/control.py | 3 +-- stem/descriptor/__init__.py | 3 +-- stem/descriptor/export.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 3 +-- stem/descriptor/microdescriptor.py | 2 +- stem/descriptor/networkstatus.py | 2 +- stem/descriptor/reader.py | 2 +- stem/descriptor/remote.py | 2 +- stem/descriptor/router_status_entry.py | 2 +- stem/descriptor/server_descriptor.py | 2 +- stem/descriptor/tordnsel.py | 2 +- stem/exit_policy.py | 3 +-- stem/prereq.py | 2 +- stem/process.py | 2 +- stem/response/__init__.py | 3 +-- stem/response/authchallenge.py | 2 +- stem/response/events.py | 3 +-- stem/response/getconf.py | 2 +- stem/response/getinfo.py | 2 +- stem/response/mapaddress.py | 2 +- stem/response/protocolinfo.py | 2 +- stem/socket.py | 3 +-- stem/util/__init__.py | 2 +- stem/util/conf.py | 3 +-- stem/util/connection.py | 2 +- stem/util/enum.py | 2 +- stem/util/log.py | 2 +- stem/util/proc.py | 2 +- stem/util/str_tools.py | 2 +- stem/util/system.py | 2 +- stem/util/term.py | 2 +- stem/util/tor_tools.py | 3 +-- stem/version.py | 2 +- test/__init__.py | 3 +-- test/mocking.py | 3 +-- test/network.py | 3 +-- test/output.py | 2 +- test/prompt.py | 2 +- test/runner.py | 3 +-- test/util.py | 2 +- 45 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst index 6d5a272..f1edeee 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -268,7 +268,7 @@ When it's finished you can direct your browser to the *_build* directory with a What is the copyright for patches? ----------------------------------

-Stem is under the LGPLv3 which is a fine license, but poses a bit of a problem for sharing code with our other projects (which are mostly BSD). To share code without needing to hunt down prior contributors we need an individual to have the copyright for the whole stem codebase. This is Damian at present, but I'll probably give it to Tor if I get nailed by a bus. +Stem is under the LGPLv3 which is a fine license, but poses a bit of a problem for sharing code with our other projects (which are mostly BSD). To share code without needing to hunt down prior contributors we need Tor to have the copyright for the whole stem codebase. Presently the copyright of stem is jointly held by its main author (`Damian http://www.atagar.com/`_) and the `Tor Project https://www.torproject.org/`_.

If you submit a substantial patch I'll ask if you're fine with it being in the public domain. This would mean that there are no legal restrictions for using your contribution, and hence won't pose a problem if we reuse stem code in other projects.

diff --git a/run_tests.py b/run_tests.py index faa99f9..0621e68 100755 --- a/run_tests.py +++ b/run_tests.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/setup.py b/setup.py index c2ce4d2..9ac187a 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

# We cannot import anything from the stem module since this would risk diff --git a/stem/__init__.py b/stem/__init__.py index ed66a99..5b9a975 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -1,5 +1,4 @@ -# Copyright 2011-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/connection.py b/stem/connection.py index c221777..dea9b00 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/control.py b/stem/control.py index 7e7aab4..472645c 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,5 +1,4 @@ -# Copyright 2011-2013, Damian Johnson -# Copyright 2012-2013, Sean Robinson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index b4fc54a..d388fd0 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2013, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/export.py b/stem/descriptor/export.py index eb9ba2b..764113b 100644 --- a/stem/descriptor/export.py +++ b/stem/descriptor/export.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 1441375..8c2b19e 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index f31e369..afcd777 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -1,4 +1,4 @@ -# Copyright 2013, Damian Johnson +# Copyright 2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 9142e63..cfe6b2f 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index 45a003c..1612159 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 601775e..2f721f6 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -1,4 +1,4 @@ -# Copyright 2013, Damian Johnson +# Copyright 2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 80b6623..733a066 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index a824613..f320008 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/descriptor/tordnsel.py b/stem/descriptor/tordnsel.py index 6e6b36d..3d7da86 100644 --- a/stem/descriptor/tordnsel.py +++ b/stem/descriptor/tordnsel.py @@ -1,4 +1,4 @@ -# Copyright 2013, Damian Johnson +# Copyright 2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/exit_policy.py b/stem/exit_policy.py index c7219b2..17f3508 100644 --- a/stem/exit_policy.py +++ b/stem/exit_policy.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2013, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/prereq.py b/stem/prereq.py index 7932361..097847f 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/process.py b/stem/process.py index 36307fc..9f4250f 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 5e0d077..3381573 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/response/authchallenge.py b/stem/response/authchallenge.py index 93be385..18a5b2c 100644 --- a/stem/response/authchallenge.py +++ b/stem/response/authchallenge.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

import binascii diff --git a/stem/response/events.py b/stem/response/events.py index 75f2532..f04a2a7 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

import datetime diff --git a/stem/response/getconf.py b/stem/response/getconf.py index dc44440..1b9007f 100644 --- a/stem/response/getconf.py +++ b/stem/response/getconf.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index 998041d..48c14dd 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py index 69585bb..8799ea1 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/response/protocolinfo.py b/stem/response/protocolinfo.py index b4f7453..0b4d352 100644 --- a/stem/response/protocolinfo.py +++ b/stem/response/protocolinfo.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

import stem.response diff --git a/stem/socket.py b/stem/socket.py index 379e5ec..d1f4896 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -1,5 +1,4 @@ -# Copyright 2011-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/__init__.py b/stem/util/__init__.py index 723eb10..8ec8eaf 100644 --- a/stem/util/__init__.py +++ b/stem/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/conf.py b/stem/util/conf.py index f897aac..d50cf14 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -1,5 +1,4 @@ -# Copyright 2011-2013, Damian Johnson -# Copyright 2013, Sean Robinson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/connection.py b/stem/util/connection.py index 4549740..3bb7df0 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/enum.py b/stem/util/enum.py index 917cca1..ee5a9c1 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/log.py b/stem/util/log.py index 6446c23..b87e741 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/proc.py b/stem/util/proc.py index e399b84..b7efdef 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/str_tools.py b/stem/util/str_tools.py index d575cfa..33d5e1b 100644 --- a/stem/util/str_tools.py +++ b/stem/util/str_tools.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/system.py b/stem/util/system.py index 5887fb7..fcec8d1 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/term.py b/stem/util/term.py index 61ba15e..f1c71ec 100644 --- a/stem/util/term.py +++ b/stem/util/term.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/util/tor_tools.py b/stem/util/tor_tools.py index 3f6ab79..510bff1 100644 --- a/stem/util/tor_tools.py +++ b/stem/util/tor_tools.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/stem/version.py b/stem/version.py index d218ffb..4d3d772 100644 --- a/stem/version.py +++ b/stem/version.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/__init__.py b/test/__init__.py index ff55c3a..19f615f 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -1,5 +1,4 @@ -# Copyright 2011-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/mocking.py b/test/mocking.py index 0d0c2e6..b076b1d 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/network.py b/test/network.py index 2dc7270..78ebf21 100644 --- a/test/network.py +++ b/test/network.py @@ -1,5 +1,4 @@ -# Copyright 2012-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/output.py b/test/output.py index 3f5efee..1d7631e 100644 --- a/test/output.py +++ b/test/output.py @@ -1,4 +1,4 @@ -# Copyright 2011-2013, Damian Johnson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/prompt.py b/test/prompt.py index 7b6fa61..8939987 100644 --- a/test/prompt.py +++ b/test/prompt.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/runner.py b/test/runner.py index a1eda9e..cccc587 100644 --- a/test/runner.py +++ b/test/runner.py @@ -1,5 +1,4 @@ -# Copyright 2011-2013, Damian Johnson -# Copyright 2012, Sean Robinson +# Copyright 2011-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

""" diff --git a/test/util.py b/test/util.py index 4ab7460..3746e55 100644 --- a/test/util.py +++ b/test/util.py @@ -1,4 +1,4 @@ -# Copyright 2012-2013, Damian Johnson +# Copyright 2012-2013, Damian Johnson and The Tor Project # See LICENSE for licensing information

"""