commit 4ff93dd94fb548251ad3d5379e4a329e51e93ef4 Merge: a1a55a33c 287b64ee1 Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 9 09:40:04 2018 -0400

Merge remote-tracking branch 'rl1987/doc26638'

CODE_OF_CONDUCT | 7 +++++++ Makefile.am | 1 + changes/doc26638 | 4 ++++ 3 files changed, 12 insertions(+)

diff --cc changes/doc26638 index 000000000,82a2861cf..d6f9b1de7 mode 000000,100644..100644 --- a/changes/doc26638 +++ b/changes/doc26638 @@@ -1,0 -1,4 +1,4 @@@ + o Minor features (development): - - Move paragraph and URL to Tor's code of conduct document ++ - Copy paragraph and URL to Tor's code of conduct document + from CONTRIBUTING to new CODE_OF_CONDUCT file. Resolves + ticket 26638.