Browse Source

Add CODE_OF_CONDUCT file

rl1987 4 years ago
parent
commit
287b64ee10
4 changed files with 12 additions and 9 deletions
  1. 7 0
      CODE_OF_CONDUCT
  2. 0 9
      CONTRIBUTING
  3. 1 0
      Makefile.am
  4. 4 0
      changes/doc26638

+ 7 - 0
CODE_OF_CONDUCT

@@ -0,0 +1,7 @@
+The Tor Project is committed to fostering a inclusive community
+where people feel safe to engage, share their points of view, and
+participate. For the latest version of our Code of Conduct, please
+see
+
+https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt
+

+ 0 - 9
CONTRIBUTING

@@ -15,15 +15,6 @@ more!
 You don't have to be a C developer to help with Tor: have a look
 at https://www.torproject.org/getinvolved/volunteer !
 
-The Tor Project is committed to fostering a inclusive community
-where people feel safe to engage, share their points of view, and
-participate. For the latest version of our Code of Conduct, please
-see
-
-https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt
-
-
-
 ### License issues
 
 Tor is distributed under the license terms in the LICENSE -- in

+ 1 - 0
Makefile.am

@@ -138,6 +138,7 @@ include contrib/include.am
 EXTRA_DIST+= \
 	ChangeLog					\
 	CONTRIBUTING					\
+	CODE_OF_CONDUCT                                 \
 	INSTALL						\
 	LICENSE						\
 	Makefile.nmake					\

+ 4 - 0
changes/doc26638

@@ -0,0 +1,4 @@
+  o Minor features (development):
+    - Move paragraph and URL to Tor's code of conduct document
+      from CONTRIBUTING to new CODE_OF_CONDUCT file. Resolves
+      ticket 26638.