Opened 3 weeks ago

Closed 3 weeks ago

#31498 closed enhancement (fixed)

clarify that tor's license is free software / open source

Reported by: arma Owned by:
Priority: Medium Milestone: Tor: 0.4.2.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: nickm-merge asn-merge
Cc: Actual Points:
Parent ID: Points:
Reviewer: dgoulet Sponsor:

Description

One of our Tor people was just asking whether Tor's license is OSI-approved.

The answer is yes, it's distributed under the 3-clause bsd license:
https://gitweb.torproject.org/tor.git/tree/LICENSE#n12

But that description in the license file could be even clearer, for people who don't already recognize the text of the 3-clause bsd license.

I propose this change:

diff --git a/LICENSE b/LICENSE
index cc27668427..438208426c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,7 +9,8 @@
         there may be other license terms that you should be aware of.
 
 ===============================================================================
-Tor is distributed under this license:
+Tor is distributed under the "3-clause BSD" license, a commonly used
+software license that means Tor is both free software and open source:
 
 Copyright (c) 2001-2004, Roger Dingledine
 Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson

I admit there is a bit of politics in my proposed change, but it's hard to describe free software licenses without a bit of politics creeping in, and this seems to me like a balanced approach.

Nick, feel free to do the commit if you're ok with it, or tell me and I will.

Child Tickets

Change History (7)

comment:1 Changed 3 weeks ago by arma

Status: newneeds_review

Ok, I made an actual git branch ticket31498 for those who prefer merging git branches. :)

comment:2 Changed 3 weeks ago by nickm

Milestone: Tor: 0.4.2.x-final

comment:3 in reply to:  1 Changed 3 weeks ago by dgoulet

Status: needs_reviewneeds_revision

Replying to arma:

Ok, I made an actual git branch ticket31498 for those who prefer merging git branches. :)

Not sure you pushed it :S ...

fatal: ambiguous argument 'arma/ticket31498': unknown revision or path not in the working tree.

comment:4 Changed 3 weeks ago by arma

I think I did.

[remote "arma"]
        url = https://git.torproject.org/user/arma/tor
        fetch = +refs/heads/*:refs/remotes/arma/*
$ git fetch arma
remote: Counting objects: 1885, done.
remote: Compressing objects: 100% (685/685), done.
remote: Total 1885 (delta 1263), reused 1756 (delta 1200)
Receiving objects: 100% (1885/1885), 2.09 MiB, done.
Resolving deltas: 100% (1263/1263), done.
From https://git.torproject.org/user/arma/tor
 * [new branch]      bug28298   -> arma/bug28298
 * [new branch]      bug29665_029 -> arma/bug29665_029
 * [new branch]      bug29665_034 -> arma/bug29665_034
 * [new branch]      ticket31498 -> arma/ticket31498

Maybe your arma points to the old arma, before the git people moved me?

comment:5 Changed 3 weeks ago by dgoulet

Reviewer: dgoulet
Status: needs_revisionmerge_ready

Arf.. yeah I was not pointing at user/arma but the old arma/ only...

Thanks!

comment:6 Changed 3 weeks ago by dgoulet

Keywords: nickm-merge asn-merge added

comment:7 Changed 3 weeks ago by asn

Resolution: fixed
Status: merge_readyclosed

merged.

Note: See TracTickets for help on using tickets.