Merge remote-tracking branch 'rl1987/doc26638'

This commit is contained in:
Nick Mathewson
2018-07-09 09:40:04 -04:00
3 changed files with 12 additions and 0 deletions
+4
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.