terms-of-service-and-privacy-policy.md

@@ -99,21 +99,51 @@ material located on or linked to by us violates your copyright, you are
 encouraged to notify us.
 
 ## 6. Data Privacy
-For more information about data privacy, see our data [privacy
-policy](#privacy-policy).
-
-As part of your voluntary contribution to any
-code base on the Website, you acknowledge and agree that your name and email address
-will become embedded and part of the repository, which may be publicly
-available. You understand the removal of this information would be
-impermissibly destructive to the project and the interests of all those who
-contribute, utilize, and benefit from it. Therefore, in consideration of
-your
-participation in any project, you hereby waive any right to request any
-erasure, removal, or rectification of this information under any applicable
-privacy or other law and acknowledge and understand that providing this
-information is a requirement under the agreement to contribute to a
-project.
+
+You shall ensure that any and all information or data, including without
+limitation, personal data, used by you in connection with the Agreement (“User
+Data”) is collected, processed, transferred and used in full compliance with
+Applicable Data Protection Laws (as defined below) and that it has all obtained
+all necessary authorizations and consents from any data subjects to process
+User Data. If applicable, you shall adopt and maintain appropriate
+organizational, technical and security measures prior to any such collection,
+processing or transfer in order to protect against unauthorized access to or
+use of User Data. You shall immediately inform use upon becoming aware of
+any breach within the meaning of Applicable Data Protection Law relating to
+User Data (a “Security Incident”) and to cooperate with us in any
+investigation thereof and in the implementation of any measures reasonably
+required to be taken in response thereto. If required by Applicable Data
+Protection Laws, the parties will enter into standard contractual clauses under
+GDPR (as defined below) for the transfer of any User Data outside of the
+European Union. For purposes hereof: (a) "Applicable Data Protection Laws"
+means any applicable laws, statutes or regulations as may be amended, extended
+or re-enacted from time to time which relate to personal data including without
+limitation (i) prior to 25 May 2018, the EU Data Protection Directive 95/46/EC
+as transposed into EU Member State law; (ii) from and after 25 May 2018, GDPR
+and any EU Member State laws implementing the GDPR; and (iii) the e-Privacy
+Directive 2002/58/EC, as amended and as transposed into EU Member State law and
+any legislation replacing the e-Privacy Directive and (b) "GDPR" means the
+Regulation (EU) 2016/679 of the European Parliament and of the Counsel of 27
+April 2016 on the protection of natural persons with regard to the processing
+of personal data and on the free movement of such data, and repealing Directive
+95/46/EC (General Data Protection Regulation).
+
+If you contribute to any project on the Website, you make the following
+acknowledgement and attestation:
+
+> As part of my voluntary contribution to any
+  code base, I acknowledge and agree that my name and email address will
+  become embedded and part of the repository, which may be publicly available. I
+  understand the removal of this information would be impermissibly destructive
+  to the project and the interests of all those who contribute, utilize, and
+  benefit from it. Therefore, in consideration of my participation in any
+  project, I hereby waive any right to request any erasure, removal, or
+  rectification of this information under any applicable privacy or other law and
+  acknowledge and understand that providing this information is a requirement
+  under the agreement to contribute to projects. 
+
+
+See also our [privacy policy](#privacy-policy).
 
 ## 7. Intellectual Property