summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-09 09:40:04 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-09 09:40:04 -0400
commit4ff93dd94fb548251ad3d5379e4a329e51e93ef4 (patch)
treea14dfb930df9ce3099c0ff8cf05fc9712da3bb38 /changes
parenta1a55a33c20364ccbc0540125d662203152a20c2 (diff)
parent287b64ee1052508a5328549b2e18d91762a0eb5d (diff)
downloadtor-4ff93dd94fb548251ad3d5379e4a329e51e93ef4.tar.gz
tor-4ff93dd94fb548251ad3d5379e4a329e51e93ef4.zip
Merge remote-tracking branch 'rl1987/doc26638'
Diffstat (limited to 'changes')
-rw-r--r--changes/doc266384
1 files changed, 4 insertions, 0 deletions
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.