diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:40:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-07-09 09:40:04 -0400 |
| commit | 4ff93dd94fb548251ad3d5379e4a329e51e93ef4 (patch) | |
| tree | a14dfb930df9ce3099c0ff8cf05fc9712da3bb38 | |
| parent | a1a55a33c20364ccbc0540125d662203152a20c2 (diff) | |
| parent | 287b64ee1052508a5328549b2e18d91762a0eb5d (diff) | |
| download | tor-4ff93dd94fb548251ad3d5379e4a329e51e93ef4.tar.gz tor-4ff93dd94fb548251ad3d5379e4a329e51e93ef4.zip | |
Merge remote-tracking branch 'rl1987/doc26638'
| -rw-r--r-- | CODE_OF_CONDUCT | 7 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | changes/doc26638 | 4 |
3 files changed, 12 insertions, 0 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/Makefile.am b/Makefile.am index c74b0e30a8..0f934cf0f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,6 +136,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..d6f9b1de70 --- /dev/null +++ b/changes/doc26638 @@ -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. |