Merge remote-tracking branch 'rl1987/doc26638'

4ff93dd9 · Nick Mathewson · a1a55a33 · 287b64ee · 4ff93dd9 · 4ff93dd9
Commit 4ff93dd9 authored Jul 09, 2018 by Nick Mathewson 🐛
--- a/CODE_OF_CONDUCT
+++ b/CODE_OF_CONDUCT
+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
+
--- 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					\

--- a/changes/doc26638
+++ b/changes/doc26638
+  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.