tor

commit 4ff93dd94fb548251ad3d5379e4a329e51e93ef4
parent a1a55a33c20364ccbc0540125d662203152a20c2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  9 Jul 2018 09:40:04 -0400

Merge remote-tracking branch 'rl1987/doc26638'

Diffstat:
A
CODE_OF_CONDUCT
 | 
7
+++++++
M
Makefile.am
 | 
1
+
A
changes/doc26638
 | 
4
++++

3 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/CODE_OF_CONDUCT 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
@@ -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
@@ -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.