Merge remote-tracking branch 'rl1987/doc26638'

diff --cc Makefile.am
Simple merge

diff --cc changes/doc26638
index 0000000000000000000000000000000000000000,82a2861cf9a0f549b88a4029546f3e2f6cd9fa7e..d6f9b1de70a97be17330fa60e74dbcbe017b5fc3
mode 000000,100644..100644
--- /dev/null
--- 2/changes/doc26638
+++ b/changes/doc26638
@@@ -1,0 -1,4 +1,4 @@@
 -    - Move paragraph and URL to Tor's code of conduct document
+   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.