Add CODE_OF_CONDUCT file

diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT
new file mode 100644 (file)
index 0000000..d8d160a
--- /dev/null
+++ b/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
+

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 3569f45a884818195eb95c09c475e08903d79959..22fd6b6386250738c0e6f4d815117db72d6e86a0 100644 (file)
--- a/CONTRIBUTING
+++ b/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

diff --git a/Makefile.am b/Makefile.am
index fe2479a642578ba612cb568841dbaced1e71dd86..10a09af8fafcd3d1ab0c4a20126dab9e35842a32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -138,6 +138,7 @@ include contrib/include.am
 EXTRA_DIST+= \
        ChangeLog                                       \
        CONTRIBUTING                                    \
+       CODE_OF_CONDUCT                                 \
        INSTALL                                         \
        LICENSE                                         \
        Makefile.nmake                                  \

diff --git a/changes/doc26638 b/changes/doc26638
new file mode 100644 (file)
index 0000000..82a2861
--- /dev/null
+++ b/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.