Skip to content

Commit

Permalink
Fix Contributor License Agreement
Browse files Browse the repository at this point in the history
The Harmony generator had left some blank spaces where values weren't supplied (guess they weren't optional!).
  • Loading branch information
adam-p committed Mar 30, 2016
1 parent 8eeb4d5 commit 39d02d3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions CLA-entity.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Psiphon Entity Contributor License Agreement

Thank you for your interest in contributing to Psiphon ("We" or "Us").

This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement.
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement, following the instructions at https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/CONTRIBUTING.md.

This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

## 1. Definitions

"You" means any Legal Entity on behalf of whom a Contribution has been received by Us. "Legal Entity" means an entity which is not a natural person. "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.

"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in .
"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/CONTRIBUTING.md.

"Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.

Expand Down Expand Up @@ -55,7 +55,7 @@ You confirm that:

(c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties.

(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted.
(d) You have followed the instructions in https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/CONTRIBUTING.md, if You do not own the Copyright in the entire work of authorship Submitted.

## 4. Disclaimer

Expand All @@ -67,7 +67,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL

## 6. Miscellaneous

6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
6.1 This Agreement will be governed by and construed in accordance with the laws of Canada excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.

6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.

Expand Down
8 changes: 4 additions & 4 deletions CLA-individual.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ Psiphon Individual Contributor License Agreement

Thank you for your interest in contributing to Psiphon ("We" or "Us").

This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement.
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement, following the instructions at https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/CONTRIBUTING.md.

This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

## 1. Definitions

"You" means the individual who Submits a Contribution to Us.

"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in .
"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/CONTRIBUTING.md.

"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.

Expand Down Expand Up @@ -55,7 +55,7 @@ You confirm that:

(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement.

(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted.
(d) You have followed the instructions in https://github.com/Psiphon-Labs/psiphon-tunnel-core/blob/master/CONTRIBUTING.md, if You do not own the Copyright in the entire work of authorship Submitted.

## 4. Disclaimer

Expand All @@ -67,7 +67,7 @@ TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABL

## 6. Miscellaneous

6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
6.1 This Agreement will be governed by and construed in accordance with the laws of Canada excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.

6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.

Expand Down
2 changes: 1 addition & 1 deletion contributors/adam-p.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
2016-03-30

I hereby agree to the terms of the "Psiphon Individual Contributor License Agreement", with MD5 checksum 1395cab47d4a1f197c604cde210d1857.
I hereby agree to the terms of the "Psiphon Individual Contributor License Agreement", with MD5 checksum 83d54c85a43e0c0f416758779ea6740a.

I furthermore declare that I am authorized and able to make this agreement and sign this declaration.

Expand Down

0 comments on commit 39d02d3

Please sign in to comment.