nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rl1987/doc26638'

Browse Source
This commit is contained in:
Nick Mathewson 2018-07-09 09:40:04 -04:00
commit 4ff93dd94f
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CODE_OF_CONDUCT Normal file
View File

@ -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

1
Makefile.am
View File

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

4
changes/doc26638 Normal file
View File

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