diff options
| author | rl1987 <rl1987@sdf.lonestar.org> | 2018-07-05 11:22:33 +0300 |
|---|---|---|
| committer | rl1987 <rl1987@sdf.lonestar.org> | 2018-07-05 11:22:33 +0300 |
| commit | 287b64ee1052508a5328549b2e18d91762a0eb5d (patch) | |
| tree | 3be9d1e9fa57a8ce8290e15ec341d85ef2fffe5c | |
| parent | 2878dad9dbc1e07f608fa3acddc76261e4d76648 (diff) | |
| download | tor-287b64ee1052508a5328549b2e18d91762a0eb5d.tar.gz tor-287b64ee1052508a5328549b2e18d91762a0eb5d.zip | |
Add CODE_OF_CONDUCT file
| -rw-r--r-- | CODE_OF_CONDUCT | 7 | ||||
| -rw-r--r-- | CONTRIBUTING | 9 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | changes/doc26638 | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT new file mode 100644 index 0000000000..d8d160a22a --- /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 3569f45a88..22fd6b6386 100644 --- 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 fe2479a642..10a09af8fa 100644 --- 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 index 0000000000..82a2861cf9 --- /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. |